Subject: Re: linux-next: build failure after merge of the final tree (sound tree related)

From: Takashi Iwai <[email-masked]>
Date: Mon, 28 Oct 2013 16:14:33 +0100

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 <[email-masked]>
Subject: [PATCH] ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR
 protection

I obviously forgot to merge the right version...

Reported-by: Stephen Rothwell <[email-masked]>
Signed-off-by: Takashi Iwai <[email-masked]>
---
 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