login
Search
Mainline is scheduled to be updated not to include slab.h implicitly from percpu.h which means that each .c file which uses gfp or slab API should include respective header file directly. This patchset contains include updates for trees which are in linux-next but not in mainline yet. These patches are on top of next-20100329 which already include Stephen's fixup patches. Please apply both Stephen's patches and these to subsystem trees. One good news is that all the problems Stephen discovered by build testing and discovered by running slabh-sweep.py script on linux-next are confined to codes which are not in mainline yet, so it looks like the original conversion is fairly comprehensive. This patchset contains the following patches. 0001-sound-update-gfp-slab.h-includes.patch 0002-kdb-update-gfp-slab.h-includes.patch 0003-fsnotify-update-gfp-slab.h-includes.patch 0004-ocfs2-update-gfp-slab.h-includes.patch 0005-staging-update-gfp-slab.h-includes.patch 0006-vbus-update-gfp-slab.h-includes.patch 0007-usb-update-gfp-slab.h-includes.patch 0008-davinci-update-gfp-slab.h-includes.patch 0009-pcmcia-update-gfp-slab.h-includes.patch 0010-wireless-update-gfp-slab.h-includes.patch 0011-mtd-update-gfp-slab.h-includes.patch 0012-mfd-update-gfp-slab.h-includes.patch 0013-hid-update-gfp-slab.h-includes.patch 0014-input-update-gfp-slab.h-includes.patch 0015-libata-update-gfp-slab.h-includes.patch 0016-acpi-update-gfp-slab.h-includes.patch 0017-arm-update-gfp-slab.h-includes.patch and contains the following changes. arch/arm/mach-vexpress/ct-ca9x4.c | 1 + drivers/acpi/apei/apei-base.c | 1 + drivers/acpi/atomicio.c | 1 + drivers/ata/ahci_platform.c | 1 + drivers/ata/libahci.c | 1 + drivers/char/sysrq.c | 2 +- drivers/gpio/rdc321x-gpio.c | 1 + drivers/hid/hid-roccat-kone.c ...
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
drivers/gpio/rdc321x-gpio.c | 1 +
drivers/mfd/davinci_voicecodec.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index 46c5519..e344907 100644
--- a/drivers/gpio/rdc321x-gpio.c
+++ b/drivers/gpio/rdc321x-gpio.c
@@ -27,6 +27,7 @@
#include <linux/pci.h>
#include <linux/gpio.h>
#include <linux/mfd/rdc321x.h>
+#include <linux/slab.h>
struct rdc321x_gpio {
spinlock_t lock;
diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index 9886aa8..3e75f02 100644
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -23,6 +23,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/clk.h>
--
1.6.4.2
--
Hi Tejun, The davinci MFD driver is sitting in Mark's tree, so I guess he should take this patch. Mark, feel free to add my: Acked-by: Samuel Ortiz <sameo@linux.intel.com> to this patch. Cheers, -- Intel Open Source Technology Centre http://oss.intel.com/ --
Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the patch doesn't apply cleanly to ASoC either. I've applied the DaVinci hunk, the other will need to go via your tree. --
Thanks, I'm pushing the rdc321x part. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ --
Hi Samuel, Mark, Thanks, guys. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/musb/musb_debugfs.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index b6a27ba..3310b52 100644 --- a/drivers/usb/musb/musb_debugfs.c +++ b/drivers/usb/musb/musb_debugfs.c @@ -34,7 +34,6 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/init.h> #include <linux/list.h> #include <linux/kobject.h> -- 1.6.4.2 --
Hi Greg, Please apply to the usb tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Greg Kroah-Hartman <gregkh@suse.de> Subject: [PATCH 07/17] usb: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:35 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/musb/musb_debugfs.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index b6a27ba..3310b52 100644 --- a/drivers/usb/musb/musb_debugfs.c +++ b/drivers/usb/musb/musb_debugfs.c @@ -34,7 +34,6 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/init.h> #include <linux/list.h> #include <linux/kobject.h> -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Kevin Hilman <khilman@deeprootsystems.com> --- drivers/rtc/rtc-davinci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 92a8f6c..34647fc 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -29,6 +29,7 @@ #include <linux/bcd.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/slab.h> /* * The DaVinci RTC is a simple RTC with the following -- 1.6.4.2 --
Hi Kevin, Please apply to the davinci tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Kevin Hilman <khilman@deeprootsystems.com> Subject: [PATCH 08/17] davinci: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:36 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Kevin Hilman <khilman@deeprootsystems.com> --- drivers/rtc/rtc-davinci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 92a8f6c..34647fc 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -29,6 +29,7 @@ #include <linux/bcd.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/slab.h> /* * The DaVinci RTC is a simple RTC with the following -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + drivers/staging/otus/usbdrv.h | 1 + drivers/staging/tm6000/tm6000-alsa.c | 1 + drivers/staging/tm6000/tm6000-cards.c | 1 + drivers/staging/tm6000/tm6000-core.c | 1 + drivers/staging/tm6000/tm6000-dvb.c | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 92d7b72..ab00846 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -49,6 +49,7 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308 #include "../comedidev.h" #include <linux/semaphore.h> +#include <linux/slab.h> #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> diff --git a/drivers/staging/otus/usbdrv.h b/drivers/staging/otus/usbdrv.h index 330d1b9..7e66c2d 100644 --- a/drivers/staging/otus/usbdrv.h +++ b/drivers/staging/otus/usbdrv.h @@ -38,6 +38,7 @@ #include <linux/uaccess.h> #include <linux/wireless.h> #include <linux/if_arp.h> +#include <linux/slab.h> #include <linux/io.h> #include "zdcompat.h" diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index bc89f9d..3404516 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@ -15,6 +15,7 @@ #include <linux/device.h> #include <linux/interrupt.h> #include <linux/usb.h> +#include <linux/slab.h> #include <asm/delay.h> #include <sound/core.h> diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 2053008..2935533 100644 --- ...
Hi Tejun, The changes to those two files are fixes mainline so should go into your These four files are intreoduced in the v4l-dvb tree, so this part should -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Tejun Heo <tj@kernel.org> Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> --- drivers/staging/tm6000/tm6000-alsa.c | 1 + drivers/staging/tm6000/tm6000-cards.c | 1 + drivers/staging/tm6000/tm6000-core.c | 1 + drivers/staging/tm6000/tm6000-dvb.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) Just the v4l-dvb split our part of what was the staging tree patch. diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index bc89f9d..3404516 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@ -15,6 +15,7 @@ #include <linux/device.h> #include <linux/interrupt.h> #include <linux/usb.h> +#include <linux/slab.h> #include <asm/delay.h> #include <sound/core.h> diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 2053008..2935533 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -24,6 +24,7 @@ #include <linux/i2c.h> #include <linux/usb.h> #include <linux/version.h> +#include <linux/slab.h> #include <media/v4l2-common.h> #include <media/tuner.h> #include <media/tvaudio.h> diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index d9cade0..2ae7ae0 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/usb.h> #include <linux/i2c.h> #include "tm6000.h" diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c index 1072206..dfba5e6 100644 --- a/drivers/staging/tm6000/tm6000-dvb.c +++ ...
Hi Mauro, Please apply this to the v4l-dvb tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Mauro Carvalho Chehab <mchehab@infradead.org> Subject: [PATCH 05a/17] v4l-dvb: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:33 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> --- drivers/staging/tm6000/tm6000-alsa.c | 1 + drivers/staging/tm6000/tm6000-cards.c | 1 + drivers/staging/tm6000/tm6000-core.c | 1 + drivers/staging/tm6000/tm6000-dvb.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index bc89f9d..3404516 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@ -15,6 +15,7 @@ #include <linux/device.h> #include <linux/interrupt.h> #include <linux/usb.h> +#include <linux/slab.h> #include <asm/delay.h> #include <sound/core.h> diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 2053008..2935533 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -24,6 +24,7 @@ #include <linux/i2c.h> #include <linux/usb.h> #include <linux/version.h> +#include <linux/slab.h> #include <media/v4l2-common.h> #include <media/tuner.h> #include <media/tvaudio.h> diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index d9cade0..2ae7ae0 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include ...
Hello, The first one is false positive caused by addition of semaphore.h inclusion in linux-next transiting quatech_daqp_cs.c from ERR to auto edit candidate. I applied the second one to slabh. I'll also pull in -rc3 and do some merge testing. If nothing else breaks, I'll ask Linus to pull in slabh. Thanks. -- tejun --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Jiri Kosina <jkosina@suse.cz> --- drivers/hid/hid-roccat-kone.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index 2b1412e..7b11784 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c @@ -35,6 +35,7 @@ #include <linux/hid.h> #include <linux/usb.h> #include <linux/module.h> +#include <linux/slab.h> #include "hid-ids.h" #include "hid-roccat-kone.h" -- 1.6.4.2 --
I have applied this to the branch of my tree in which development of roccat-kone driver for 2.6.35 is happening. Thanks, -- Jiri Kosina SUSE Labs, Novell Inc. --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: David Woodhouse <dwmw2@infradead.org> --- drivers/mtd/mtdcore.c | 1 + drivers/mtd/nand/mpc5121_nfc.c | 1 + drivers/mtd/nand/r852.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index e8573c9..3c48193 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -17,6 +17,7 @@ #include <linux/mtd/compatmac.h> #include <linux/proc_fs.h> #include <linux/idr.h> +#include <linux/gfp.h> #include <linux/mtd/mtd.h> #include "internal.h" diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index d7333f4..1a06f78 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -27,6 +27,7 @@ #include <linux/module.h> #include <linux/clk.h> +#include <linux/gfp.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/interrupt.h> diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c index 96bfbd8..dd5158c 100644 --- a/drivers/mtd/nand/r852.c +++ b/drivers/mtd/nand/r852.c @@ -15,6 +15,7 @@ #include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/delay.h> +#include <linux/slab.h> #include <asm/byteorder.h> #include <linux/sched.h> #include "sm_common.h" -- 1.6.4.2 --
Hi David, Please apply to the mtd tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, David Woodhouse <dwmw2@infradead.org> Subject: [PATCH 11/17] mtd: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:39 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: David Woodhouse <dwmw2@infradead.org> --- drivers/mtd/mtdcore.c | 1 + drivers/mtd/nand/mpc5121_nfc.c | 1 + drivers/mtd/nand/r852.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index e8573c9..3c48193 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -18,6 +18,7 @@ #include <linux/proc_fs.h> #include <linux/idr.h> #include <linux/backing-dev.h> +#include <linux/gfp.h> #include <linux/mtd/mtd.h> diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index d7333f4..1a06f78 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -27,6 +27,7 @@ #include <linux/module.h> #include <linux/clk.h> +#include <linux/gfp.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/interrupt.h> diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c index 96bfbd8..dd5158c 100644 --- a/drivers/mtd/nand/r852.c +++ b/drivers/mtd/nand/r852.c @@ -15,6 +15,7 @@ #include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/delay.h> +#include <linux/slab.h> #include <asm/byteorder.h> #include <linux/sched.h> #include "sm_common.h" -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Jeff Garzik <jgarzik@pobox.com> --- drivers/ata/ahci_platform.c | 1 + drivers/ata/libahci.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 42cdd73..19bfd1d 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -13,6 +13,7 @@ */ #include <linux/kernel.h> +#include <linux/gfp.h> #include <linux/module.h> #include <linux/init.h> #include <linux/interrupt.h> diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 3f586ec..34fc57d 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -33,6 +33,7 @@ */ #include <linux/kernel.h> +#include <linux/gfp.h> #include <linux/module.h> #include <linux/init.h> #include <linux/blkdev.h> -- 1.6.4.2 --
Unless you object, I'll go ahead and apply this to #upstream... --
Hi Jeff, Thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: John W. Linville <linville@tuxdriver.com> --- drivers/net/wireless/ath/ath9k/htc.h | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 7770649..4497479 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -23,6 +23,7 @@ #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/leds.h> +#include <linux/slab.h> #include <net/mac80211.h> #include "common.h" diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c index 4c5395e..0cc7fd9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c @@ -30,6 +30,7 @@ #include <linux/module.h> #include <linux/etherdevice.h> #include <linux/sched.h> +#include <linux/gfp.h> #include <net/mac80211.h> #include "iwl-dev.h" -- 1.6.4.2 --
Hi John, I think that this patch is still needed in the wireless tree and I notice that Dave has asked Linus to pull the net tree (containing the wireless tree). I have been carrying this in linux-next. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Looks like this was part of a series...who merged the rest of it? I guess I presumed they would take care of the series. Tejun, I wouldn't mind a repost, preferrably Cc: linux-wireless@vger.kernel.org... John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready. --
Hi John, It was a series of patches that were only relevant to the trees in linux-next (for a change that happened in Linus' tree). My hope (and I assume Tejun's) was that each maintainer would take the patch relevant to their tree (some did - I just checked I still have 10 of them being applied to linux-next :-(). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Hello, John, Stephen. Most of the series have been applied circa 2.6.34-rc4. Stephen has been carrying patches for branches which weren't yet in mainline. IOW, these patches are necessary for a branch to be merged into Yeap, I hoped that more of them would sort themselves out during devel cycle, but I guess rc1 window isn't too bad. Thank you. -- tejun --
Hi Tejun, I have now reposted all the outstanding ones. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Thanks for taking care of them. :-) -- tejun --
Hi John, Please apply to the wireless tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, "John W. Linville" <linville@tuxdriver.com> Subject: [PATCH 10/17] wireless: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:38 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: John W. Linville <linville@tuxdriver.com> --- drivers/net/wireless/ath/ath9k/htc.h | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 7770649..4497479 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -23,6 +23,7 @@ #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/leds.h> +#include <linux/slab.h> #include <net/mac80211.h> #include "common.h" diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c index 4c5395e..0cc7fd9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c @@ -30,6 +30,7 @@ #include <linux/module.h> #include <linux/etherdevice.h> #include <linux/sched.h> +#include <linux/gfp.h> #include <net/mac80211.h> #include "iwl-dev.h" -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Dominik Brodowski <linux@dominikbrodowski.net> --- drivers/isdn/hardware/avm/avm_cs.c | 1 - drivers/pcmcia/pcmcia_cis.c | 1 + drivers/pcmcia/rsrc_iodyn.c | 1 + 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index 8bbc452..f410d0e 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c @@ -13,7 +13,6 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/ptrace.h> -#include <linux/slab.h> #include <linux/string.h> #include <linux/tty.h> #include <linux/serial.h> diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c index 7406387..4a65eaf 100644 --- a/drivers/pcmcia/pcmcia_cis.c +++ b/drivers/pcmcia/pcmcia_cis.c @@ -14,6 +14,7 @@ * */ +#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/netdevice.h> diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c index 7791375..d0bf350 100644 --- a/drivers/pcmcia/rsrc_iodyn.c +++ b/drivers/pcmcia/rsrc_iodyn.c @@ -12,6 +12,7 @@ * (C) 1999 David A. Hinds */ +#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -- 1.6.4.2 --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Len Brown <lenb@kernel.org> --- drivers/acpi/apei/apei-base.c | 1 + drivers/acpi/atomicio.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c index c35fec7..2672880 100644 --- a/drivers/acpi/apei/apei-base.c +++ b/drivers/acpi/apei/apei-base.c @@ -34,6 +34,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> +#include <linux/slab.h> #include <linux/io.h> #include <linux/kref.h> #include <linux/rculist.h> diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 4ed1385..e21b1e4 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c @@ -31,6 +31,7 @@ #include <linux/kref.h> #include <linux/rculist.h> #include <linux/interrupt.h> +#include <linux/slab.h> #include <acpi/atomicio.h> #define ACPI_PFX "ACPI: " -- 1.6.4.2 --
Hi Len, Please apply this to the acpi tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Len Brown <lenb@kernel.org> Subject: [PATCH 16/17] acpi: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:44 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Len Brown <lenb@kernel.org> --- drivers/acpi/apei/apei-base.c | 1 + drivers/acpi/atomicio.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c index c35fec7..2672880 100644 --- a/drivers/acpi/apei/apei-base.c +++ b/drivers/acpi/apei/apei-base.c @@ -34,6 +34,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> +#include <linux/slab.h> #include <linux/io.h> #include <linux/kref.h> #include <linux/rculist.h> diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 4ed1385..e21b1e4 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c @@ -31,6 +31,7 @@ #include <linux/kref.h> #include <linux/rculist.h> #include <linux/interrupt.h> +#include <linux/slab.h> #include <acpi/atomicio.h> #define ACPI_PFX "ACPI: " -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/char/sysrq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 532c56c..593562d 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -41,7 +41,7 @@ #include <linux/hrtimer.h> #include <linux/oom.h> #include <linux/input.h> -#include <linux/gfp.h> +#include <linux/slab.h> #include <asm/ptrace.h> #include <asm/irq_regs.h> -- 1.6.4.2 --
Hi Tejun, This patch does not apply to the input tree. That tree does not have the #include <linux/gfp.h> line (your tree (slabh) adds that later in the linux-next cycle). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Hello, Ah, I see. sysrq.c's requirement changed between mainline and linux-next. I'll update slabh tree such that it includes slab.h from there. Thanks. -- tejun --
Hello, again. slabh updated such that... * kmemcheck fix patch is placed before the patch to break implicit slab.h inclusion. * sysrq.c now includes slab.h instead of gfp.h. * Updated against the current mainline 9623e5a23724d09283c238960946ec6f65733afe. Conversion script was run again and outputs are compared. No new dependency appeared since the last round. So, it should now be safe to ignore this patch. Thanks. -- tejun --
Hi Tejun, Great, thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Russell King <linux@arm.linux.org.uk> --- arch/arm/mach-vexpress/ct-ca9x4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 5a0449c..b4b0bb4 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c @@ -2,6 +2,7 @@ * Versatile Express Core Tile Cortex A9x4 Support */ #include <linux/init.h> +#include <linux/gfp.h> #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/amba/bus.h> -- 1.6.4.2 --
Hi Russell, Please apply to the arm tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Russell King <linux@arm.linux.org.uk> Subject: [PATCH 17/17] arm: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:45 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Russell King <linux@arm.linux.org.uk> --- arch/arm/mach-vexpress/ct-ca9x4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 5a0449c..b4b0bb4 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c @@ -2,6 +2,7 @@ * Versatile Express Core Tile Cortex A9x4 Support */ #include <linux/init.h> +#include <linux/gfp.h> #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/platform_device.h> -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
I'm afraid it's too late for the first round; I sent Linus the pull request yesterday. However, I'll queue it in a few days as a fix. --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Eric Paris <eparis@redhat.com> --- fs/notify/fanotify/fanotify_user.c | 1 + fs/notify/mark.c | 1 - fs/notify/vfsmount_mark.c | 1 - 3 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 7c869fa..c437bd4 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -10,6 +10,7 @@ #include <linux/poll.h> #include <linux/security.h> #include <linux/syscalls.h> +#include <linux/slab.h> #include <linux/types.h> #include <linux/uaccess.h> diff --git a/fs/notify/mark.c b/fs/notify/mark.c index 1e824e6..4fd74ba 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -87,7 +87,6 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/mutex.h> -#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/writeback.h> /* for inode_lock */ diff --git a/fs/notify/vfsmount_mark.c b/fs/notify/vfsmount_mark.c index 8f1aa02..ec580a2 100644 --- a/fs/notify/vfsmount_mark.c +++ b/fs/notify/vfsmount_mark.c @@ -22,7 +22,6 @@ #include <linux/module.h> #include <linux/mount.h> #include <linux/mutex.h> -#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/writeback.h> /* for inode_lock */ -- 1.6.4.2 --
Hi Eric, Please apply to the fsnotify tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Eric Paris <eparis@redhat.com> Subject: [PATCH 03/17] fsnotify: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:31 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Eric Paris <eparis@redhat.com> --- fs/notify/fanotify/fanotify_user.c | 1 + fs/notify/vfsmount_mark.c | 1 - 3 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 7c869fa..c437bd4 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -10,6 +10,7 @@ #include <linux/poll.h> #include <linux/security.h> #include <linux/syscalls.h> +#include <linux/slab.h> #include <linux/types.h> #include <linux/uaccess.h> diff --git a/fs/notify/vfsmount_mark.c b/fs/notify/vfsmount_mark.c index 8f1aa02..ec580a2 100644 --- a/fs/notify/vfsmount_mark.c +++ b/fs/notify/vfsmount_mark.c @@ -22,7 +22,6 @@ #include <linux/module.h> #include <linux/mount.h> #include <linux/mutex.h> -#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/writeback.h> /* for inode_lock */ -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Joel Becker <joel.becker@oracle.com> --- fs/ocfs2/reservations.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c index 7fc6cfe..ed59559 100644 --- a/fs/ocfs2/reservations.c +++ b/fs/ocfs2/reservations.c @@ -26,7 +26,6 @@ #include <linux/fs.h> #include <linux/types.h> -#include <linux/slab.h> #include <linux/highmem.h> #include <linux/bitops.h> #include <linux/list.h> -- 1.6.4.2 --
Hi Joel, Please apply to the ocfs2 tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Joel Becker <joel.becker@oracle.com> Subject: [PATCH 04/17] ocfs2: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:32 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Joel Becker <joel.becker@oracle.com> --- fs/ocfs2/reservations.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c index 7fc6cfe..ed59559 100644 --- a/fs/ocfs2/reservations.c +++ b/fs/ocfs2/reservations.c @@ -26,7 +26,6 @@ #include <linux/fs.h> #include <linux/types.h> -#include <linux/slab.h> #include <linux/highmem.h> #include <linux/bitops.h> #include <linux/list.h> -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Gregory Haskins <ghaskins@novell.com> --- drivers/vbus/pci-bridge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c index 0d51324..36de7c4 100644 --- a/drivers/vbus/pci-bridge.c +++ b/drivers/vbus/pci-bridge.c @@ -22,6 +22,7 @@ #include <linux/pci.h> #include <linux/mm.h> #include <linux/workqueue.h> +#include <linux/slab.h> #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/ioq.h> -- 1.6.4.2 --
>>> On 3/29/2010 at 01:52 PM, in message <1269885165-18617-7-git-send-email-tj@kernel.org>, Tejun Heo <tj@kernel.org> Thanks Tejun, Acked-by: Gregory Haskins <ghaskins@novell.com> --
Hi Gregory, It never made it as far as I can see ... maybe something equivalent went in. From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Gregory Haskins <ghaskins@novell.com> Subject: [PATCH 06/17] vbus: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:34 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Gregory Haskins <ghaskins@novell.com> --- drivers/vbus/pci-bridge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c index 0d51324..36de7c4 100644 --- a/drivers/vbus/pci-bridge.c +++ b/drivers/vbus/pci-bridge.c @@ -22,6 +22,7 @@ #include <linux/pci.h> #include <linux/mm.h> #include <linux/workqueue.h> +#include <linux/slab.h> #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/ioq.h> -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
>>> On 5/19/2010 at 11:42 AM, in message <20100520014225.e4343903.sfr@canb.auug.org.au>, Stephen Rothwell Hi Steven, I dropped the ball on this. Will merge when I return from lunch. --
>>> On 5/19/2010 at 12:56 PM, in message <4BF41843.61E : 90 : 47687>, Gregory Pushed (and sorry for the name mis-spelling above, Stephen!) -Greg --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Takashi Iwai <tiwai@suse.de> --- sound/soc/codecs/cq93vc.c | 1 + sound/soc/davinci/davinci-vcif.c | 1 + sound/usb/caiaq/input.c | 1 + sound/usb/urb.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 5132974..8f19b93 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -27,6 +27,7 @@ #include <linux/pm.h> #include <linux/platform_device.h> #include <linux/device.h> +#include <linux/slab.h> #include <linux/clk.h> #include <linux/mfd/davinci_voicecodec.h> diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 54b91e1..9aa980d 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -24,6 +24,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/delay.h> +#include <linux/slab.h> #include <linux/io.h> #include <linux/mfd/davinci_voicecodec.h> diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c index 27ed0bc..8bbfbfd 100644 --- a/sound/usb/caiaq/input.c +++ b/sound/usb/caiaq/input.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/gfp.h> #include <linux/init.h> #include <linux/usb.h> #include <linux/usb/input.h> diff --git a/sound/usb/urb.c b/sound/usb/urb.c index e2b7c47..5570a2b 100644 --- a/sound/usb/urb.c +++ b/sound/usb/urb.c @@ -15,6 +15,7 @@ * */ +#include <linux/gfp.h> #include <linux/init.h> #include <linux/usb.h> #include <linux/usb/audio.h> -- 1.6.4.2 --
At Tue, 30 Mar 2010 02:52:29 +0900, Thanks, applied now to sound git tree. --
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Jason Wessel <jason.wessel@windriver.com> --- kernel/debug/kdb/kdb_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index bad8e63..ec29a9d 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -37,6 +37,7 @@ #include <linux/kdebug.h> #include <linux/proc_fs.h> #include <linux/uaccess.h> +#include <linux/slab.h> #include "kdb_private.h" #define GREP_LEN 256 -- 1.6.4.2 --
Hi Jason, Please apply to the kgdb tree (patch reposted below). From: Tejun Heo <tj@kernel.org> To: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, Jason Wessel <jason.wessel@windriver.com> Subject: [PATCH 02/17] kdb: update gfp/slab.h includes Date: Tue, 30 Mar 2010 02:52:30 +0900 Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Jason Wessel <jason.wessel@windriver.com> --- kernel/debug/kdb/kdb_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index bad8e63..ec29a9d 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -37,6 +37,7 @@ #include <linux/kdebug.h> #include <linux/proc_fs.h> #include <linux/uaccess.h> +#include <linux/slab.h> #include "kdb_private.h" #define GREP_LEN 256 -- 1.6.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --
No problem. Looks like it got missed earlier, because I have a fixup from you for the kdb_support.c file. I folded this into kgdb-next. Cheers, Jason. --
Hello, Stephen. You probably have noticed already but both slabh branch and percpu changes have been merged to mainline, so once these patches are merged to subsystem trees, there shouldn't be many new breakages showing up in linux-next. Thanks a lot for helping testing and fixing up this huge ugly monster. Much appreciated. -- tejun --
