Messages in this thread Patch in this message | | | Date | Mon, 29 Mar 2010 16:02:50 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the slabh tree |
| |
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 :-)).
From: Stephen Rothwell <sfr@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@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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
| |