public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Nicolin Chen <b42378@freescale•com>
Subject: Re: linux-next: build failure after merge of the final tree (sound tree related)
Date: Mon, 28 Oct 2013 16:14:33 +0100	[thread overview]
Message-ID: <s5h8uxdwhpi.wl%tiwai@suse.de> (raw)
In-Reply-To: <20131029014234.fa29fdc685dbd73934cf1768@canb.auug.org.au>

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 <tiwai@suse•de>
Subject: [PATCH] ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR
 protection

I obviously forgot to merge the right version...

Reported-by: Stephen Rothwell <sfr@canb•auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse•de>
---
 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

  reply	other threads:[~2013-10-28 15:14 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-28 14:42 linux-next: build failure after merge of the final tree (sound tree related) Stephen Rothwell
2013-10-28 15:14 ` Takashi Iwai [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-10-18  3:16 Stephen Rothwell
2012-10-18  6:18 ` Takashi Iwai
2012-08-24  7:20 Stephen Rothwell
2012-08-25 13:42 ` Takashi Iwai
2012-03-14  7:05 Stephen Rothwell
2012-03-14  7:22 ` Takashi Iwai
2011-11-01  9:24 Stephen Rothwell
2011-11-01  9:48 ` Takashi Iwai
2011-06-28  6:50 Stephen Rothwell
2011-06-28  6:57 ` Takashi Iwai
2011-06-14  6:03 Stephen Rothwell
2011-06-14  6:19 ` Takashi Iwai
2011-03-16  6:39 Stephen Rothwell
2011-03-16  6:49 ` Takashi Iwai
2011-01-11  2:20 Stephen Rothwell
2011-01-11  6:40 ` Takashi Iwai
2010-09-21  6:40 Stephen Rothwell
2010-09-21  8:02 ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5h8uxdwhpi.wl%tiwai@suse.de \
    --to=tiwai@suse$(echo .)de \
    --cc=b42378@freescale$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox