linux-next: build failure after merge of the slabh tree
in [Kernel]
|
Prev: linux-next: build failure after merge of the slabh tree
Next: linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell on 29 Mar 2010 02:20 Hi Tejun, After merging the slabh tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/dma/timb_dma.c: In function 'td_alloc_init_desc': drivers/dma/timb_dma.c:381: error: implicit declaration of function 'kzalloc' drivers/dma/timb_dma.c:381: warning: assignment makes pointer from integer without a cast drivers/dma/timb_dma.c:389: warning: assignment makes pointer from integer without a cast drivers/dma/timb_dma.c:410: error: implicit declaration of function 'kfree' drivers/dma/timb_dma.c: In function 'td_probe': drivers/dma/timb_dma.c:710: warning: assignment makes pointer from integer without a cast Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't implicitly include slab.h from percpu.h") from the slabh tree interacting with commit de5d4453c5b224eefd02b6a141ed411a76d458af ("dma: Add timb-dma") from the async_tx tree. I applied the following merge fixup patch which should be applied to the async_tx tree (see Documentation/SubmitChecklist Rule #1 :-)). From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Mon, 29 Mar 2010 15:54:40 +1100 Subject: [PATCH] async_tx: use of kzalloc/kfree requires the include of slab.h Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> --- drivers/dma/timb_dma.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c index e20d5c1..44b346d 100644 --- a/drivers/dma/timb_dma.c +++ b/drivers/dma/timb_dma.c @@ -27,6 +27,7 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/slab.h> #include <linux/timb_dma.h> -- 1.7.0.3 -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Takashi Iwai on 29 Mar 2010 02:30 At Mon, 29 Mar 2010 16:02:50 +1100, Stephen Rothwell wrote: > > Hi Tejun, > > After merging the slabh tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > sound/usb/mixer_quirks.c: In function 'snd_usb_soundblaster_remote_init': > sound/usb/mixer_quirks.c:144: error: implicit declaration of function 'kmalloc' > sound/usb/mixer_quirks.c:144: warning: assignment makes pointer from integer without a cast > > Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't > implicitly include slab.h from percpu.h") from the slabh tree interacting > with commit 7b1eda223debcba706ab989a09c4eecb327aebdf ("ALSA: usb-mixer: > factor out quirks") from the sound tree. > > I applied the following merge fixup patch which should be applied to the > sound tree (see Documentation/SubmitChecklist Rule #1 :-)). Thanks, I applied all these oneliners to sound/usb/* as a single patch now. Takashi > From: Stephen Rothwell <sfr(a)canb.auug.org.au> > Date: Mon, 29 Mar 2010 15:59:58 +1100 > Subject: [PATCH] sound: use of kmalloc requires the include of slab.h > > Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> > --- > sound/usb/mixer_quirks.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c > index 56b6659..e7df1e5 100644 > --- a/sound/usb/mixer_quirks.c > +++ b/sound/usb/mixer_quirks.c > @@ -26,6 +26,7 @@ > */ > > #include <linux/init.h> > +#include <linux/slab.h> > #include <linux/usb.h> > #include <linux/usb/audio.h> > > -- > 1.7.0.3 > > -- > Cheers, > Stephen Rothwell sfr(a)canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 29 Mar 2010 02:40
Hi Takashi, On Mon, 29 Mar 2010 08:28:09 +0200 Takashi Iwai <tiwai(a)suse.de> wrote: > > Thanks, I applied all these oneliners to sound/usb/* as a single > patch now. Again, thanks. They were just one liner because I found them one at a time :-( -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |