From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932605Ab3J1PLr (ORCPT ); Mon, 28 Oct 2013 11:11:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43522 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932260Ab3J1PLo (ORCPT ); Mon, 28 Oct 2013 11:11:44 -0400 Date: Mon, 28 Oct 2013 16:14:33 +0100 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolin Chen Subject: Re: linux-next: build failure after merge of the final tree (sound tree related) In-Reply-To: <20131029014234.fa29fdc685dbd73934cf1768@canb.auug.org.au> References: <20131029014234.fa29fdc685dbd73934cf1768@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 29 Oct 2013 01:42:34 +1100, Stephen Rothwell wrote: > > Hi all, > > After merging the final tree, today's linux-next build (i386 defconfig) > failed like this: > > sound/built-in.o: In function `snd_free_dev_iram': > (.text+0x17028): undefined reference to `gen_pool_free' > > Presumably caused by commit 055032142c42 ("ALSA: Add SoC on-chip internal > ram support for DMA buffer allocation") from the sound tree. > > I have left this broken for today. The proper fix has been pushed now to for-next branch. thanks, Takashi --- From: Takashi Iwai Subject: [PATCH] ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR protection I obviously forgot to merge the right version... Reported-by: Stephen Rothwell Signed-off-by: Takashi Iwai --- sound/core/memalloc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 51a7921..809fd79 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -159,6 +159,7 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr, dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma); } +#ifdef CONFIG_GENERIC_ALLOCATOR /** * snd_malloc_dev_iram - allocate memory from on-chip internal ram * @dmab: buffer allocation record to store the allocated data @@ -198,6 +199,7 @@ void snd_free_dev_iram(struct snd_dma_buffer *dmab) if (pool && dmab->area) gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes); } +#endif /* CONFIG_GENERIC_ALLOCATOR */ #endif /* CONFIG_HAS_DMA */ /* -- 1.8.4.1