I recently picked up my older work to remove unnecessary #includes of
sched.h, starting from a patch by Dave Jones to not include sched.h
from module.h. This reduces the number of indirect includes of sched.h
by ~300. Another ~400 pointless direct includes can be removed after
this disentangling (patch to follow later).
However, quite a few indirect includes need to be fixed up for this.
In order to feed the patches through -mm with as little disturbance
as possible, I've split out the fixes I accumulated up to now (complete
for i386 and x86_64, more archs to follow later) and post them before
the real patch. This way this large part of the patch is kept simple
with only adding #includes, and all hunks are independent of each other.
So if any hunk rejects or gets in the way of other patches, just drop it.
My scripts will pick it up again in the next round.
thanks,
Tim
Fix missing includes. Based on a patch by Dave Jones.
This is a preparatory step for not including sched.h from module.h.
Signed-off-by: Tim Schmielau <[email protected]>
--- linux-2.6.14-rc2-mm1/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2005-09-24 10:47:21.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2005-09-24 10:56:04.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/compiler.h>
+#include <linux/sched.h> /* current */
#include <asm/io.h>
#include <asm/delay.h>
#include <asm/uaccess.h>
diff -urp linux-2.6.14-rc2-mm1/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux-2.6.14-rc2-mm1-sr-dj6/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- linux-2.6.14-rc2-mm1/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2005-09-24 10:53:20.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/cpufreq.h>
#include <linux/slab.h>
#include <linux/cpumask.h>
+#include <linux/sched.h> /* current / set_cpus_allowed() */
#include <asm/processor.h>
#include <asm/msr.h>
--- linux-2.6.14-rc2-mm1/arch/i386/kernel/cpu/cpufreq/powernow-k8.c 2005-09-24 10:52:00.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/arch/i386/kernel/cpu/cpufreq/powernow-k8.c 2005-09-24 10:53:20.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/cpumask.h>
+#include <linux/sched.h> /* for current / set_cpus_allowed() */
#include <asm/msr.h>
#include <asm/io.h>
--- linux-2.6.14-rc2-mm1/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2005-09-24 10:47:21.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2005-09-24 10:53:20.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/init.h>
#include <linux/cpufreq.h>
#include <linux/config.h>
+#include <linux/sched.h> /* current */
#include <linux/delay.h>
#include <linux/compiler.h>
--- linux-2.6.14-rc2-mm1/arch/i386/kernel/cpu/intel_cacheinfo.c 2005-09-24 10:52:00.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/arch/i386/kernel/cpu/intel_cacheinfo.c 2005-09-24 10:53:20.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/device.h>
#include <linux/compiler.h>
#include <linux/cpu.h>
+#include <linux/sched.h>
#include <asm/processor.h>
#include <asm/smp.h>
--- linux-2.6.14-rc2-mm1/drivers/acpi/processor_idle.c 2005-09-24 10:52:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/acpi/processor_idle.c 2005-09-24 10:53:20.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/acpi.h>
#include <linux/dmi.h>
#include <linux/moduleparam.h>
+#include <linux/sched.h> /* need_resched() */
#include <asm/io.h>
#include <asm/uaccess.h>
--- linux-2.6.14-rc2-mm1/drivers/base/sys.c 2005-09-24 10:47:24.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/base/sys.c 2005-09-24 10:53:20.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/pm.h>
+#include <asm/semaphore.h>
extern struct subsystem devices_subsys;
--- linux-2.6.14-rc2-mm1/drivers/block/paride/paride.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/block/paride/paride.c 2005-09-24 10:53:20.000000000 +0200
@@ -29,6 +29,7 @@
#include <linux/string.h>
#include <linux/spinlock.h>
#include <linux/wait.h>
+#include <linux/sched.h> /* TASK_* */
#ifdef CONFIG_PARPORT_MODULE
#define CONFIG_PARPORT
--- linux-2.6.14-rc2-mm1/drivers/block/paride/pg.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/block/paride/pg.c 2005-09-24 10:53:20.000000000 +0200
@@ -162,6 +162,8 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV,
#include <linux/mtio.h>
#include <linux/pg.h>
#include <linux/device.h>
+#include <linux/sched.h> /* current, TASK_* */
+#include <linux/jiffies.h>
#include <asm/uaccess.h>
--- linux-2.6.14-rc2-mm1/drivers/block/paride/pt.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/block/paride/pt.c 2005-09-24 10:53:20.000000000 +0200
@@ -146,6 +146,7 @@ static int (*drives[4])[6] = {&drive0, &
#include <linux/slab.h>
#include <linux/mtio.h>
#include <linux/device.h>
+#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */
#include <asm/uaccess.h>
--- linux-2.6.14-rc2-mm1/drivers/char/watchdog/cpu5wdt.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/watchdog/cpu5wdt.c 2005-09-24 10:53:20.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/timer.h>
+#include <linux/jiffies.h>
#include <asm/io.h>
#include <asm/uaccess.h>
--- linux-2.6.14-rc2-mm1/drivers/char/watchdog/mixcomwd.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/watchdog/mixcomwd.c 2005-09-24 10:53:20.000000000 +0200
@@ -45,6 +45,8 @@
#include <linux/fs.h>
#include <linux/reboot.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
#include <asm/uaccess.h>
#include <asm/io.h>
--- linux-2.6.14-rc2-mm1/drivers/char/watchdog/pcwd.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/watchdog/pcwd.c 2005-09-24 10:53:20.000000000 +0200
@@ -66,7 +66,7 @@
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/reboot.h>
-
+#include <linux/sched.h> /* TASK_INTERRUPTIBLE, set_current_state() and friends */
#include <asm/uaccess.h>
#include <asm/io.h>
--- linux-2.6.14-rc2-mm1/drivers/char/watchdog/sc520_wdt.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/watchdog/sc520_wdt.c 2005-09-24 10:53:20.000000000 +0200
@@ -63,6 +63,7 @@
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
#include <asm/io.h>
#include <asm/uaccess.h>
--- linux-2.6.14-rc2-mm1/drivers/char/watchdog/softdog.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/watchdog/softdog.c 2005-09-24 10:53:20.000000000 +0200
@@ -47,6 +47,8 @@
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
+
#include <asm/uaccess.h>
#define PFX "SoftDog: "
--- linux-2.6.14-rc2-mm1/drivers/infiniband/core/cache.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/core/cache.c 2005-09-24 10:53:20.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/slab.h>
+#include <linux/sched.h> /* INIT_WORK, schedule_work(), flush_scheduled_work() */
#include <rdma/ib_cache.h>
--- linux-2.6.14-rc2-mm1/drivers/input/gameport/gameport.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/gameport/gameport.c 2005-09-24 10:53:20.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/kthread.h>
+#include <linux/sched.h> /* HZ */
/*#include <asm/io.h>*/
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/a3d.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/a3d.c 2005-09-24 10:53:20.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "FP-Gaming Assasin 3D joystick driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/adi.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/adi.c 2005-09-24 10:53:20.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/input.h>
#include <linux/gameport.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Logitech ADI joystick family driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/analog.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/analog.c 2005-09-24 10:53:20.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/gameport.h>
+#include <linux/jiffies.h>
#include <asm/timex.h>
#define DRIVER_DESC "Analog joystick and gamepad driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/cobra.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/cobra.c 2005-09-24 10:53:20.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Creative Labs Blaster GamePad Cobra driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/gf2k.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/gf2k.c 2005-09-24 10:53:20.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/gameport.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Genius Flight 2000 joystick driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/grip.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/grip.c 2005-09-24 10:53:20.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Gravis GrIP protocol joystick driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/grip_mp.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/grip_mp.c 2005-09-24 10:53:20.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/input.h>
#include <linux/delay.h>
#include <linux/proc_fs.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Gravis Grip Multiport driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/guillemot.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/guillemot.c 2005-09-24 10:53:20.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Guillemot Digital joystick driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/interact.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/interact.c 2005-09-24 10:53:20.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "InterAct digital joystick driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/sidewinder.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/sidewinder.c 2005-09-24 10:53:20.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/gameport.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "Microsoft SideWinder joystick family driver"
--- linux-2.6.14-rc2-mm1/drivers/input/joystick/tmdc.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/tmdc.c 2005-09-24 10:53:20.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "ThrustMaster DirectConnect joystick driver"
--- linux-2.6.14-rc2-mm1/drivers/input/serio/hp_sdc_mlc.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/serio/hp_sdc_mlc.c 2005-09-24 10:53:20.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/string.h>
+#include <asm/semaphore.h>
#define PREFIX "HP SDC MLC: "
--- linux-2.6.14-rc2-mm1/drivers/isdn/capi/capifs.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/isdn/capi/capifs.c 2005-09-24 10:53:20.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ctype.h>
+#include <linux/sched.h> /* current */
MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem");
MODULE_AUTHOR("Carsten Paeth");
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2005-09-24 10:53:20.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/rwsem.h>
+#include <linux/sched.h>
#include "dvb_ca_en50221.h"
#include "dvb_ringbuffer.h"
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/frontends/bcm3510.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/bcm3510.c 2005-09-24 10:53:20.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/firmware.h>
+#include <linux/jiffies.h>
#include "dvb_frontend.h"
#include "bcm3510.h"
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/frontends/s5h1420.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/s5h1420.c 2005-09-24 10:53:20.000000000 +0200
@@ -26,6 +26,8 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <asm/div64.h>
#include "dvb_frontend.h"
#include "s5h1420.h"
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/frontends/stv0297.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/stv0297.c 2005-09-24 10:53:20.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/module.h>
#include <linux/string.h>
#include <linux/delay.h>
+#include <linux/jiffies.h>
#include "dvb_frontend.h"
#include "stv0297.h"
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/frontends/stv0299.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/stv0299.c 2005-09-24 10:53:20.000000000 +0200
@@ -48,6 +48,7 @@
#include <linux/moduleparam.h>
#include <linux/string.h>
#include <linux/slab.h>
+#include <linux/jiffies.h>
#include <asm/div64.h>
#include "dvb_frontend.h"
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/frontends/tda1004x.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/tda1004x.c 2005-09-24 10:53:20.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/device.h>
+#include <linux/jiffies.h>
#include "dvb_frontend.h"
#include "tda1004x.h"
--- linux-2.6.14-rc2-mm1/drivers/media/dvb/frontends/tda8083.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/tda8083.c 2005-09-24 10:53:20.000000000 +0200
@@ -30,6 +30,7 @@
#include <linux/moduleparam.h>
#include <linux/string.h>
#include <linux/slab.h>
+#include <linux/jiffies.h>
#include "dvb_frontend.h"
#include "tda8083.h"
--- linux-2.6.14-rc2-mm1/drivers/media/radio/miropcm20-rds.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/radio/miropcm20-rds.c 2005-09-24 10:53:20.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
+#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */
#include <linux/delay.h>
#include <asm/uaccess.h>
#include "miropcm20-rds-core.h"
--- linux-2.6.14-rc2-mm1/drivers/mtd/mtdblock.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/mtdblock.c 2005-09-24 10:53:20.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
+#include <linux/sched.h> /* TASK_* */
#include <linux/mtd/mtd.h>
#include <linux/mtd/blktrans.h>
--- linux-2.6.14-rc2-mm1/drivers/mtd/mtdchar.c 2005-09-24 10:52:02.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/mtdchar.c 2005-09-24 10:53:20.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/fs.h>
+#include <linux/sched.h> /* TASK_* */
#include <asm/uaccess.h>
#include <linux/device.h>
--- linux-2.6.14-rc2-mm1/drivers/mtd/mtdconcat.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/mtdconcat.c 2005-09-24 10:53:20.000000000 +0200
@@ -14,7 +14,7 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-
+#include <linux/sched.h> /* TASK_* */
#include <linux/mtd/mtd.h>
#include <linux/mtd/concat.h>
--- linux-2.6.14-rc2-mm1/drivers/scsi/scsi_transport_fc.c 2005-09-24 10:47:29.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/scsi/scsi_transport_fc.c 2005-09-24 10:53:20.000000000 +0200
@@ -26,6 +26,7 @@
*/
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/sched.h> /* workqueue stuff, HZ */
#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport.h>
--- linux-2.6.14-rc2-mm1/drivers/usb/host/ohci-pxa27x.c 2005-09-24 10:52:03.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/usb/host/ohci-pxa27x.c 2005-09-24 10:53:20.000000000 +0200
@@ -20,6 +20,7 @@
*/
#include <linux/device.h>
+#include <linux/signal.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
--- linux-2.6.14-rc2-mm1/drivers/w1/w1_family.c 2005-09-24 10:47:30.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/drivers/w1/w1_family.c 2005-09-24 10:53:20.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/list.h>
+#include <linux/sched.h> /* schedule_timeout() */
#include <linux/delay.h>
#include "w1_family.h"
--- linux-2.6.14-rc2-mm1/fs/filesystems.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/fs/filesystems.c 2005-09-24 10:53:20.000000000 +0200
@@ -12,6 +12,7 @@
#include <linux/kmod.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/sched.h> /* for 'current' */
#include <asm/uaccess.h>
/*
--- linux-2.6.14-rc2-mm1/fs/jffs2/background.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/fs/jffs2/background.c 2005-09-24 10:53:20.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/jffs2.h>
#include <linux/mtd/mtd.h>
#include <linux/completion.h>
+#include <linux/sched.h>
#include "nodelist.h"
--- linux-2.6.14-rc2-mm1/fs/jffs2/wbuf.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/fs/jffs2/wbuf.c 2005-09-24 10:53:20.000000000 +0200
@@ -18,6 +18,8 @@
#include <linux/mtd/mtd.h>
#include <linux/crc32.h>
#include <linux/mtd/nand.h>
+#include <linux/jiffies.h>
+
#include "nodelist.h"
/* For testing write failures */
--- linux-2.6.14-rc2-mm1/include/linux/cpufreq.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/linux/cpufreq.h 2005-09-24 10:53:20.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/completion.h>
#include <linux/workqueue.h>
#include <linux/cpumask.h>
+#include <asm/div64.h>
#define CPUFREQ_NAME_LEN 16
--- linux-2.6.14-rc2-mm1/include/linux/gameport.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/linux/gameport.h 2005-09-24 10:53:20.000000000 +0200
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <linux/list.h>
#include <linux/device.h>
+#include <linux/timer.h>
struct gameport {
--- linux-2.6.14-rc2-mm1/include/linux/i2c.h 2005-09-24 10:47:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/linux/i2c.h 2005-09-24 10:53:20.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/types.h>
#include <linux/i2c-id.h>
#include <linux/device.h> /* for struct device */
+#include <linux/sched.h> /* for completion */
#include <asm/semaphore.h>
/* --- For i2c-isa ---------------------------------------------------- */
--- linux-2.6.14-rc2-mm1/include/linux/kobj_map.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/linux/kobj_map.h 2005-09-24 10:53:20.000000000 +0200
@@ -1,5 +1,7 @@
#ifdef __KERNEL__
+#include <asm/semaphore.h>
+
typedef struct kobject *kobj_probe_t(dev_t, int *, void *);
struct kobj_map;
--- linux-2.6.14-rc2-mm1/include/pcmcia/ss.h 2005-09-24 10:52:10.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/pcmcia/ss.h 2005-09-24 10:53:20.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/config.h>
#include <linux/device.h>
+#include <linux/sched.h> /* task_struct, completion */
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
--- linux-2.6.14-rc2-mm1/include/scsi/scsi_cmnd.h 2005-09-24 10:47:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/scsi/scsi_cmnd.h 2005-09-24 10:53:20.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/dma-mapping.h>
#include <linux/list.h>
#include <linux/types.h>
+#include <linux/timer.h>
struct request;
struct scatterlist;
--- linux-2.6.14-rc2-mm1/include/scsi/scsi_transport_fc.h 2005-09-24 10:52:10.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/include/scsi/scsi_transport_fc.h 2005-09-24 10:53:20.000000000 +0200
@@ -28,6 +28,7 @@
#define SCSI_TRANSPORT_FC_H
#include <linux/config.h>
+#include <linux/sched.h> /* work_struct */
struct scsi_transport_template;
--- linux-2.6.14-rc2-mm1/kernel/kallsyms.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/kernel/kallsyms.c 2005-09-24 10:53:20.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
#include <linux/err.h>
#include <linux/proc_fs.h>
+#include <linux/sched.h> /* for cond_resched */
#include <linux/mm.h>
#include <asm/sections.h>
--- linux-2.6.14-rc2-mm1/lib/smp_processor_id.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/lib/smp_processor_id.c 2005-09-24 10:53:20.000000000 +0200
@@ -5,6 +5,7 @@
*/
#include <linux/module.h>
#include <linux/kallsyms.h>
+#include <linux/sched.h>
unsigned int debug_smp_processor_id(void)
{
--- linux-2.6.14-rc2-mm1/sound/oss/ac97_codec.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj6/sound/oss/ac97_codec.c 2005-09-24 10:53:20.000000000 +0200
@@ -55,6 +55,7 @@
#include <linux/pci.h>
#include <linux/ac97_codec.h>
#include <asm/uaccess.h>
+#include <asm/semaphore.h>
#define CODEC_ID_BUFSZ 14
To be applied on top of the previous fix-missing-includes patch.
Still preparing for removing #include <linux/sched.h> from module.h.
I'm now about half-way through the architectures. This is getting
boring...
Again, if any hunk rejects or gets in the way of other patches, just drop
it. I will pick it up again in the next round.
thanks,
Tim
Fix more missing includes as a preparatory step for not including
sched.h from module.h. This should now cover i386, x86_64, alpha,
arm, ppc64, and s390 architectures.
Signed-off-by: Tim Schmielau <[email protected]>
--- linux-2.6.14-rc2-mm1-sr-dj6/Documentation/firmware_class/firmware_sample_driver.c 2005-09-24 10:47:20.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/Documentation/firmware_class/firmware_sample_driver.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h>
+#include <linux/string.h>
#include "linux/firmware.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/Documentation/firmware_class/firmware_sample_firmware_class.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/Documentation/firmware_class/firmware_sample_firmware_class.c 2005-09-25 02:33:39.000000000 +0200
@@ -14,6 +14,8 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/string.h>
#include <linux/firmware.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/common/amba.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/common/amba.c 2005-09-25 02:33:39.000000000 +0200
@@ -10,6 +10,8 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/io.h>
#include <asm/irq.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/common/scoop.c 2005-09-24 10:47:21.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/common/scoop.c 2005-09-25 02:33:39.000000000 +0200
@@ -12,6 +12,9 @@
*/
#include <linux/device.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
#include <asm/io.h>
#include <asm/hardware/scoop.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/kernel/arthur.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/kernel/arthur.c 2005-09-25 02:33:39.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/stddef.h>
#include <linux/signal.h>
#include <linux/init.h>
+#include <linux/sched.h>
#include <asm/ptrace.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-imx/generic.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-imx/generic.c 2005-09-25 02:33:39.000000000 +0200
@@ -26,6 +26,8 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/string.h>
+
#include <asm/arch/imxfb.h>
#include <asm/hardware.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-integrator/clock.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-integrator/clock.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
+#include <linux/string.h>
#include <asm/semaphore.h>
#include <asm/hardware/clock.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-integrator/integrator_ap.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-integrator/integrator_ap.c 2005-09-25 02:33:39.000000000 +0200
@@ -30,6 +30,7 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/setup.h>
+#include <asm/param.h> /* HZ */
#include <asm/mach-types.h>
#include <asm/hardware/amba.h>
#include <asm/hardware/amba_kmi.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-integrator/lm.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-integrator/lm.c 2005-09-25 02:33:39.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <asm/arch/lm.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-iop3xx/iq31244-pci.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-iop3xx/iq31244-pci.c 2005-09-25 02:33:39.000000000 +0200
@@ -14,6 +14,8 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/hardware.h>
#include <asm/irq.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-iop3xx/iq80321-pci.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-iop3xx/iq80321-pci.c 2005-09-25 02:33:39.000000000 +0200
@@ -14,6 +14,8 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/hardware.h>
#include <asm/irq.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-iop3xx/iq80331-pci.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-iop3xx/iq80331-pci.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,8 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/hardware.h>
#include <asm/irq.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-iop3xx/iq80332-pci.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-iop3xx/iq80332-pci.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,8 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/hardware.h>
#include <asm/irq.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-pxa/generic.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-pxa/generic.c 2005-09-25 02:33:39.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/device.h>
#include <linux/ioport.h>
#include <linux/pm.h>
+#include <linux/string.h>
#include <asm/hardware.h>
#include <asm/irq.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-sa1100/generic.c 2005-09-24 10:47:21.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-sa1100/generic.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/pm.h>
#include <linux/cpufreq.h>
#include <linux/ioport.h>
+#include <linux/sched.h> /* just for sched_clock() - funny that */
#include <asm/div64.h>
#include <asm/hardware.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/mach-versatile/clock.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/mach-versatile/clock.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
+#include <linux/string.h>
#include <asm/semaphore.h>
#include <asm/hardware/clock.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/arm/plat-omap/clock.c 2005-09-24 10:47:21.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/arm/plat-omap/clock.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
+#include <linux/string.h>
#include <asm/io.h>
#include <asm/semaphore.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/ia64/kernel/cyclone.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/ia64/kernel/cyclone.c 2005-09-25 02:33:39.000000000 +0200
@@ -2,6 +2,7 @@
#include <linux/smp.h>
#include <linux/time.h>
#include <linux/errno.h>
+#include <linux/timex.h>
#include <asm/io.h>
/* IBM Summit (EXA) Cyclone counter code*/
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/ppc64/kernel/hvcserver.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/ppc64/kernel/hvcserver.c 2005-09-25 02:33:39.000000000 +0200
@@ -22,6 +22,8 @@
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/module.h>
+#include <linux/slab.h>
+
#include <asm/hvcall.h>
#include <asm/hvcserver.h>
#include <asm/io.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/ppc64/kernel/of_device.c 2005-09-24 10:52:00.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/ppc64/kernel/of_device.c 2005-09-25 02:33:39.000000000 +0200
@@ -4,6 +4,8 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+
#include <asm/errno.h>
#include <asm/of_device.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/arch/ppc64/lib/locks.c 2005-09-24 10:47:23.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/arch/ppc64/lib/locks.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,8 @@
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/stringify.h>
+#include <linux/smp.h>
+
#include <asm/hvcall.h>
#include <asm/iSeries/HvCall.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/base/class.c 2005-09-24 10:52:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/base/class.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/string.h>
#include <linux/kdev_t.h>
#include <linux/err.h>
+#include <linux/slab.h>
#include "base.h"
#define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/base/platform.c 2005-09-24 10:47:24.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/base/platform.c 2005-09-25 02:33:39.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/dma-mapping.h>
#include <linux/bootmem.h>
#include <linux/err.h>
+#include <linux/slab.h>
struct device platform_bus = {
.bus_id = "platform",
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/block/cciss_scsi.c 2005-09-24 10:47:24.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/block/cciss_scsi.c 2005-09-25 02:33:39.000000000 +0200
@@ -28,13 +28,17 @@
through the array controller. Note in particular, neither
physical nor logical disks are presented through the scsi layer. */
+#include <linux/timer.h>
+#include <linux/completion.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+
+#include <asm/atomic.h>
+
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
-#include <asm/atomic.h>
-#include <linux/timer.h>
-#include <linux/completion.h>
#include "cciss_scsi.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/agp/ati-agp.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/ati-agp.c 2005-09-25 02:33:39.000000000 +0200
@@ -6,6 +6,8 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <linux/agp_backend.h>
#include <asm/agp.h>
#include "agp.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/agp/i460-agp.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/i460-agp.c 2005-09-25 02:33:39.000000000 +0200
@@ -10,6 +10,8 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <linux/agp_backend.h>
#include "agp.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/agp/isoch.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/isoch.c 2005-09-25 02:33:39.000000000 +0200
@@ -6,6 +6,7 @@
#include <linux/pci.h>
#include <linux/agp_backend.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include "agp.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/agp/sworks-agp.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/sworks-agp.c 2005-09-25 02:33:39.000000000 +0200
@@ -5,6 +5,8 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <linux/agp_backend.h>
#include "agp.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/char/drm/drm_sysfs.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/drm/drm_sysfs.c 2005-09-25 02:33:39.000000000 +0200
@@ -15,6 +15,8 @@
#include <linux/device.h>
#include <linux/kdev_t.h>
#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/string.h>
#include "drm_core.h"
#include "drmP.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/core/sa_query.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/core/sa_query.c 2005-09-25 02:33:39.000000000 +0200
@@ -43,6 +43,7 @@
#include <linux/dma-mapping.h>
#include <linux/kref.h>
#include <linux/idr.h>
+#include <linux/workqueue.h>
#include <rdma/ib_pack.h>
#include <rdma/ib_sa.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/hw/mthca/mthca_av.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_av.c 2005-09-25 02:33:39.000000000 +0200
@@ -34,6 +34,8 @@
*/
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <rdma/ib_verbs.h>
#include <rdma/ib_cache.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/hw/mthca/mthca_mad.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_mad.c 2005-09-25 02:35:07.000000000 +0200
@@ -34,6 +34,9 @@
* $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $
*/
+#include <linux/string.h>
+#include <linux/slab.h>
+
#include <rdma/ib_verbs.h>
#include <rdma/ib_mad.h>
#include <rdma/ib_smi.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/hw/mthca/mthca_mcg.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_mcg.c 2005-09-25 02:33:39.000000000 +0200
@@ -33,6 +33,8 @@
*/
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "mthca_dev.h"
#include "mthca_cmd.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/hw/mthca/mthca_profile.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_profile.c 2005-09-25 02:33:39.000000000 +0200
@@ -35,6 +35,8 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "mthca_profile.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/hw/mthca/mthca_qp.c 2005-09-24 10:52:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_qp.c 2005-09-25 02:33:39.000000000 +0200
@@ -36,6 +36,8 @@
*/
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <rdma/ib_verbs.h>
#include <rdma/ib_cache.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/infiniband/hw/mthca/mthca_reset.c 2005-09-24 10:47:25.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_reset.c 2005-09-25 02:33:39.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include "mthca_dev.h"
#include "mthca_cmd.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/input/joystick/joydump.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/input/joystick/joydump.c 2005-09-25 02:33:39.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/slab.h>
#define DRIVER_DESC "Gameport data dumper module"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/macintosh/macio_asic.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/macintosh/macio_asic.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,8 @@
#include <linux/pci_ids.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/slab.h>
+
#include <asm/machdep.h>
#include <asm/macio.h>
#include <asm/pmac_feature.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mca/mca-device.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mca/mca-device.c 2005-09-25 02:33:39.000000000 +0200
@@ -29,6 +29,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/mca.h>
+#include <linux/string.h>
/**
* mca_device_read_stored_pos - read POS register from stored data
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/common/ir-common.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/common/ir-common.c 2005-09-25 02:33:39.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/string.h>
#include <media/ir-common.h>
/* -------------------------------------------------------------------------- */
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/bcm3510.c 2005-09-24 10:53:20.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/bcm3510.c 2005-09-25 02:33:39.000000000 +0200
@@ -37,6 +37,8 @@
#include <linux/device.h>
#include <linux/firmware.h>
#include <linux/jiffies.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "bcm3510.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/dib3000mb.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/dib3000mb.c 2005-09-25 02:33:39.000000000 +0200
@@ -27,6 +27,8 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dib3000-common.h"
#include "dib3000mb_priv.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/dib3000mc.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/dib3000mc.c 2005-09-25 02:33:39.000000000 +0200
@@ -26,6 +26,8 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dib3000-common.h"
#include "dib3000mc_priv.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/dvb_dummy_fe.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/dvb_dummy_fe.c 2005-09-25 02:33:39.000000000 +0200
@@ -22,6 +22,8 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "dvb_dummy_fe.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/lgdt330x.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/lgdt330x.c 2005-09-25 02:33:39.000000000 +0200
@@ -37,6 +37,8 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/byteorder.h>
#include "dvb_frontend.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/mt312.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/mt312.c 2005-09-25 02:33:39.000000000 +0200
@@ -29,6 +29,8 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "mt312_priv.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/mt352.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/mt352.c 2005-09-25 02:33:39.000000000 +0200
@@ -35,6 +35,8 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "mt352_priv.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/nxt2002.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/nxt2002.c 2005-09-25 02:33:39.000000000 +0200
@@ -32,6 +32,8 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "nxt2002.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/or51132.c 2005-09-24 10:47:26.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/or51132.c 2005-09-25 02:33:39.000000000 +0200
@@ -36,6 +36,8 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/byteorder.h>
#include "dvb_frontend.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/or51211.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/or51211.c 2005-09-25 02:33:39.000000000 +0200
@@ -34,6 +34,8 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/byteorder.h>
#include "dvb_frontend.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/sp8870.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/sp8870.c 2005-09-25 02:33:39.000000000 +0200
@@ -32,6 +32,8 @@
#include <linux/device.h>
#include <linux/firmware.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "sp8870.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/sp887x.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/sp887x.c 2005-09-25 02:33:39.000000000 +0200
@@ -14,6 +14,8 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "sp887x.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/stv0297.c 2005-09-24 10:53:20.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/stv0297.c 2005-09-25 02:33:39.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/jiffies.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "stv0297.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/media/dvb/frontends/tda1004x.c 2005-09-24 10:53:20.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/media/dvb/frontends/tda1004x.c 2005-09-25 02:33:39.000000000 +0200
@@ -33,6 +33,9 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/jiffies.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
#include "dvb_frontend.h"
#include "tda1004x.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/message/i2o/device.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/message/i2o/device.c 2005-09-25 02:33:39.000000000 +0200
@@ -16,6 +16,8 @@
#include <linux/module.h>
#include <linux/i2o.h>
#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "core.h"
/**
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/message/i2o/driver.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/message/i2o/driver.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,9 @@
#include <linux/module.h>
#include <linux/rwsem.h>
#include <linux/i2o.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "core.h"
#define OSM_NAME "i2o"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/message/i2o/exec-osm.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/message/i2o/exec-osm.c 2005-09-25 02:33:39.000000000 +0200
@@ -30,6 +30,10 @@
#include <linux/module.h>
#include <linux/i2o.h>
#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <asm/param.h> /* HZ */
#include "core.h"
#define OSM_NAME "exec-osm"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/message/i2o/iop.c 2005-09-24 10:52:02.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/message/i2o/iop.c 2005-09-25 02:33:39.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/module.h>
#include <linux/i2o.h>
#include <linux/delay.h>
+#include <linux/sched.h>
#include "core.h"
#define OSM_NAME "i2o"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/chips/jedec.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/chips/jedec.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/mtd/jedec.h>
#include <linux/mtd/map.h>
#include <linux/mtd/mtd.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/devices/lart.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/devices/lart.c 2005-09-25 02:33:39.000000000 +0200
@@ -44,6 +44,7 @@
#include <linux/types.h>
#include <linux/init.h>
#include <linux/errno.h>
+#include <linux/string.h>
#include <linux/mtd/mtd.h>
#ifdef HAVE_PARTITIONS
#include <linux/mtd/partitions.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/devices/phram.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/devices/phram.c 2005-09-25 02:33:39.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/list.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args)
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/bast-flash.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/bast-flash.c 2005-09-25 02:33:39.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/ceiva.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/ceiva.c 2005-09-25 02:33:39.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/dc21285.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/dc21285.c 2005-09-25 02:33:39.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/dilnetpc.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/dilnetpc.c 2005-09-25 02:33:39.000000000 +0200
@@ -30,12 +30,15 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/concat.h>
+#include <asm/io.h>
+
/*
** The DIL/NetPC keeps its BIOS in two distinct flash blocks.
** Destroying any of these blocks transforms the DNPC into
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/epxa10db-flash.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/epxa10db-flash.c 2005-09-25 02:33:39.000000000 +0200
@@ -27,12 +27,15 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
#include <asm/hardware.h>
+
#ifdef CONFIG_EPXA10DB
#define BOARD_NAME "EPXA10DB"
#else
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/fortunet.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/fortunet.c 2005-09-25 02:33:39.000000000 +0200
@@ -7,11 +7,14 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+
#define MAX_NUM_REGIONS 4
#define MAX_NUM_PARTITIONS 8
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/ixp2000.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/ixp2000.c 2005-09-25 02:33:39.000000000 +0200
@@ -22,11 +22,13 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
#include <asm/io.h>
#include <asm/hardware.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/ixp4xx.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/ixp4xx.c 2005-09-25 02:33:39.000000000 +0200
@@ -20,11 +20,14 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
+
#include <asm/io.h>
#include <asm/mach-types.h>
#include <asm/mach/flash.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/lubbock-flash.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/lubbock-flash.c 2005-09-25 02:33:39.000000000 +0200
@@ -15,10 +15,13 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <linux/dma-mapping.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/mainstone-flash.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/mainstone-flash.c 2005-09-25 02:33:39.000000000 +0200
@@ -16,9 +16,12 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/omap-toto-flash.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/omap-toto-flash.c 2005-09-25 02:33:39.000000000 +0200
@@ -12,9 +12,9 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/omap_nor.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/omap_nor.c 2005-09-25 02:33:39.000000000 +0200
@@ -36,6 +36,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/ioport.h>
+#include <linux/slab.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/pci.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/pci.c 2005-09-25 02:33:39.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/plat-ram.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/plat-ram.c 2005-09-25 02:33:39.000000000 +0200
@@ -30,6 +30,7 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/maps/tqm8xxl.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/maps/tqm8xxl.c 2005-09-25 02:33:39.000000000 +0200
@@ -27,12 +27,14 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+
#define FLASH_ADDR 0x40000000
#define FLASH_SIZE 0x00800000
#define FLASH_BANK_MAX 4
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/mtd/nand/s3c2410.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/mtd/nand/s3c2410.c 2005-09-25 02:33:39.000000000 +0200
@@ -51,6 +51,7 @@
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/err.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/hotplug/cpcihp_generic.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/cpcihp_generic.c 2005-09-25 02:33:39.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/pci.h>
+#include <linux/string.h>
#include "cpci_hotplug.h"
#define DRIVER_VERSION "0.1"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/hotplug/cpcihp_zt5550.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/cpcihp_zt5550.c 2005-09-25 02:33:39.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/pci.h>
+#include <linux/signal.h> /* SA_SHIRQ */
#include "cpci_hotplug.h"
#include "cpcihp_zt5550.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/hotplug/fakephp.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/fakephp.c 2005-09-25 02:33:39.000000000 +0200
@@ -37,6 +37,8 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "pci_hotplug.h"
#include "../pci.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/hotplug/rpadlpar_core.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/rpadlpar_core.c 2005-09-25 02:36:22.000000000 +0200
@@ -16,10 +16,13 @@
*/
#include <linux/init.h>
#include <linux/pci.h>
+#include <linux/string.h>
+
#include <asm/pci-bridge.h>
#include <asm/semaphore.h>
#include <asm/rtas.h>
#include <asm/vio.h>
+
#include "../pci.h"
#include "rpaphp.h"
#include "rpadlpar.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/hotplug/rpaphp_pci.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/rpaphp_pci.c 2005-09-25 02:33:39.000000000 +0200
@@ -23,11 +23,13 @@
*
*/
#include <linux/pci.h>
+#include <linux/string.h>
+
#include <asm/pci-bridge.h>
#include <asm/rtas.h>
#include <asm/machdep.h>
-#include "../pci.h" /* for pci_add_new_bus */
+#include "../pci.h" /* for pci_add_new_bus */
#include "rpaphp.h"
static struct pci_bus *find_bus_among_children(struct pci_bus *bus,
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/hotplug/rpaphp_slot.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/rpaphp_slot.c 2005-09-25 02:33:39.000000000 +0200
@@ -27,6 +27,9 @@
#include <linux/kobject.h>
#include <linux/sysfs.h>
#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
#include <asm/rtas.h>
#include "rpaphp.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/pci-driver.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/pci-driver.c 2005-09-25 02:37:52.000000000 +0200
@@ -8,6 +8,8 @@
#include <linux/init.h>
#include <linux/device.h>
#include <linux/mempolicy.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include "pci.h"
/*
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/pci.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/pci.c 2005-09-25 02:37:01.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/pci.h>
#include <linux/module.h>
#include <linux/spinlock.h>
+#include <linux/string.h>
#include <asm/dma.h> /* isa_dma_bridge_buggy */
#include "pci.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/pcie/portdrv_core.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/pcie/portdrv_core.c 2005-09-25 02:37:01.000000000 +0200
@@ -11,6 +11,8 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/pm.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <linux/pcieport_if.h>
#include "portdrv.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/pcie/portdrv_pci.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/pcie/portdrv_pci.c 2005-09-25 02:37:01.000000000 +0200
@@ -12,6 +12,7 @@
#include <linux/errno.h>
#include <linux/pm.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/pcieport_if.h>
#include "portdrv.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pci/rom.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/rom.c 2005-09-25 02:37:01.000000000 +0200
@@ -9,6 +9,7 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pci.h>
+#include <linux/slab.h>
#include "pci.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pnp/manager.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pnp/manager.c 2005-09-25 02:40:11.000000000 +0200
@@ -12,6 +12,8 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pnp.h>
+#include <linux/slab.h>
+#include <linux/bitmap.h>
#include "base.h"
DECLARE_MUTEX(pnp_res_mutex);
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/pnp/pnpbios/rsparser.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/pnp/pnpbios/rsparser.c 2005-09-25 02:37:01.000000000 +0200
@@ -7,6 +7,8 @@
#include <linux/ctype.h>
#include <linux/pnp.h>
#include <linux/pnpbios.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#ifdef CONFIG_PCI
#include <linux/pci.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/s390/cio/cmf.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/s390/cio/cmf.c 2005-09-25 02:37:01.000000000 +0200
@@ -30,10 +30,13 @@
#include <linux/list.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/timex.h> /* get_clock() */
#include <asm/ccwdev.h>
#include <asm/cio.h>
#include <asm/cmb.h>
+#include <asm/div64.h>
#include "cio.h"
#include "css.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/s390/cio/device.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/s390/cio/device.c 2005-09-25 02:37:01.000000000 +0200
@@ -22,6 +22,7 @@
#include <asm/ccwdev.h>
#include <asm/cio.h>
+#include <asm/param.h> /* HZ */
#include "cio.h"
#include "css.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/s390/cio/device_fsm.c 2005-09-24 10:47:27.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/s390/cio/device_fsm.c 2005-09-25 02:37:01.000000000 +0200
@@ -11,6 +11,8 @@
#include <linux/module.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/string.h>
#include <asm/ccwdev.h>
#include <asm/cio.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/scsi/scsi_transport_iscsi.c 2005-09-24 10:52:03.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/scsi/scsi_transport_iscsi.c 2005-09-25 02:41:33.000000000 +0200
@@ -22,7 +22,11 @@
*/
#include <linux/module.h>
#include <linux/mempool.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
#include <net/tcp.h>
+
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-09-25 02:37:01.000000000 +0200
@@ -37,6 +37,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+#include <linux/slab.h>
+
#include "sym_glue.h"
#include "sym_nvram.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-09-25 02:37:01.000000000 +0200
@@ -37,6 +37,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/gfp.h>
+
#ifndef SYM_HIPD_H
#define SYM_HIPD_H
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/sh/superhyway/superhyway.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/sh/superhyway/superhyway.c 2005-09-25 02:37:01.000000000 +0200
@@ -16,6 +16,8 @@
#include <linux/types.h>
#include <linux/list.h>
#include <linux/superhyway.h>
+#include <linux/string.h>
+#include <linux/slab.h>
static int superhyway_devices;
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/usb/host/ohci-omap.c 2005-09-24 10:52:03.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/usb/host/ohci-omap.c 2005-09-25 02:37:01.000000000 +0200
@@ -14,6 +14,9 @@
* This file is licenced under the GPL.
*/
+#include <linux/signal.h> /* SA_INTERRUPT */
+#include <linux/jiffies.h>
+
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/mach-types.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/zorro/zorro-sysfs.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/zorro/zorro-sysfs.c 2005-09-25 02:37:01.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/zorro.h>
#include <linux/stat.h>
+#include <linux/string.h>
#include "zorro.h"
--- linux-2.6.14-rc2-mm1-sr-dj6/drivers/zorro/zorro.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/drivers/zorro/zorro.c 2005-09-25 02:37:01.000000000 +0200
@@ -16,6 +16,8 @@
#include <linux/init.h>
#include <linux/zorro.h>
#include <linux/bitops.h>
+#include <linux/string.h>
+
#include <asm/setup.h>
#include <asm/amigahw.h>
--- linux-2.6.14-rc2-mm1-sr-dj6/include/linux/i2o.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/include/linux/i2o.h 2005-09-25 02:37:01.000000000 +0200
@@ -25,10 +25,14 @@
/* How many different OSM's are we allowing */
#define I2O_MAX_DRIVERS 8
-#include <asm/io.h>
-#include <asm/semaphore.h> /* Needed for MUTEX init macros */
#include <linux/pci.h>
#include <linux/dma-mapping.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h> /* work_struct */
+
+#include <asm/io.h>
+#include <asm/semaphore.h> /* Needed for MUTEX init macros */
/* message queue empty */
#define I2O_QUEUE_EMPTY 0xffffffff
--- linux-2.6.14-rc2-mm1-sr-dj6/include/linux/mtd/map.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/include/linux/mtd/map.h 2005-09-25 02:37:01.000000000 +0200
@@ -8,7 +8,10 @@
#include <linux/config.h>
#include <linux/types.h>
#include <linux/list.h>
+#include <linux/string.h>
+
#include <linux/mtd/compatmac.h>
+
#include <asm/unaligned.h>
#include <asm/system.h>
#include <asm/io.h>
diff -urp linux-2.6.14-rc2-mm1-sr-dj6/include/linux/textsearch.h linux-2.6.14-rc2-mm1-sr-dj8/include/linux/textsearch.h
--- linux-2.6.14-rc2-mm1-sr-dj6/include/linux/textsearch.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/include/linux/textsearch.h 2005-09-25 02:37:01.000000000 +0200
@@ -8,6 +8,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/err.h>
+#include <linux/slab.h>
struct ts_config;
--- linux-2.6.14-rc2-mm1-sr-dj6/kernel/params.c 2005-09-24 10:47:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/kernel/params.c 2005-09-25 02:37:01.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/err.h>
+#include <linux/slab.h>
#if 0
#define DEBUGP printk
--- linux-2.6.14-rc2-mm1-sr-dj6/lib/kobject.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/lib/kobject.c 2005-09-25 02:37:01.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/string.h>
#include <linux/module.h>
#include <linux/stat.h>
+#include <linux/slab.h>
/**
* populate_dir - populate directory with attributes.
--- linux-2.6.14-rc2-mm1-sr-dj6/lib/sort.c 2005-09-24 10:47:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj8/lib/sort.c 2005-09-25 02:47:38.000000000 +0200
@@ -7,6 +7,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sort.h>
+#include <linux/slab.h>
static void u32_swap(void *a, void *b, int size)
{
Fix more missing includes as a preparatory step for not including sched.h
from module.h. Together with the two previous patches this now covers
all architectures.
I'll let the patches settle before I push the patch to actually remove
sched.h inclusion from module.h.
Signed-off-by: Tim Schmielau <[email protected]>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/cris/arch-v10/drivers/axisflashmap.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/cris/arch-v10/drivers/axisflashmap.c 2005-09-27 17:50:32.000000000 +0200
@@ -140,6 +140,7 @@
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/concat.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/cris/arch-v32/drivers/axisflashmap.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/cris/arch-v32/drivers/axisflashmap.c 2005-09-27 17:50:32.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/concat.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/cris/kernel/time.c 2005-09-27 17:23:30.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/cris/kernel/time.c 2005-09-27 17:50:32.000000000 +0200
@@ -31,6 +31,7 @@
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/profile.h>
+#include <linux/sched.h> /* just for sched_clock() - funny that */
u64 jiffies_64 = INITIAL_JIFFIES;
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/m32r/lib/csum_partial_copy.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/m32r/lib/csum_partial_copy.c 2005-09-27 17:50:32.000000000 +0200
@@ -18,10 +18,10 @@
#include <linux/module.h>
#include <linux/types.h>
+#include <linux/string.h>
#include <net/checksum.h>
#include <asm/byteorder.h>
-#include <asm/string.h>
#include <asm/uaccess.h>
/*
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/mips/sgi-ip27/ip27-berr.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/mips/sgi-ip27/ip27-berr.c 2005-09-27 17:50:32.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/signal.h> /* for SIGBUS */
#include <asm/module.h>
#include <asm/sn/addrs.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/ppc/syslib/of_device.c 2005-09-27 17:23:46.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/ppc/syslib/of_device.c 2005-09-27 17:50:32.000000000 +0200
@@ -4,6 +4,8 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+
#include <asm/errno.h>
#include <asm/of_device.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/sh/drivers/dma/dma-sysfs.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/sh/drivers/dma/dma-sysfs.c 2005-09-27 17:50:32.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/sysdev.h>
#include <linux/module.h>
+#include <linux/string.h>
#include <asm/dma.h>
static struct sysdev_class dma_sysclass = {
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/sh/kernel/cpufreq.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/sh/kernel/cpufreq.c 2005-09-27 17:50:32.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/delay.h>
#include <linux/cpumask.h>
#include <linux/smp.h>
+#include <linux/sched.h> /* set_cpus_allowed() */
#include <asm/processor.h>
#include <asm/watchdog.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/xtensa/kernel/platform.c 2005-09-27 17:23:46.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/xtensa/kernel/platform.c 2005-09-27 17:50:32.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/time.h>
#include <asm/platform.h>
#include <asm/timex.h>
+#include <asm/param.h> /* HZ */
#define _F(r,f,a,b) \
r __platform_##f a b; \
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/ali-agp.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/char/agp/ali-agp.c 2005-09-27 17:50:32.000000000 +0200
@@ -7,6 +7,7 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/agp_backend.h>
+#include <asm/page.h> /* PAGE_SIZE */
#include "agp.h"
#define ALI_AGPCTRL 0xb8
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/amd64-agp.c 2005-09-27 17:23:31.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/char/agp/amd64-agp.c 2005-09-27 17:50:32.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/agp_backend.h>
+#include <asm/page.h> /* PAGE_SIZE */
#include "agp.h"
/* Will need to be increased if AMD64 ever goes >8-way. */
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/mwave/3780i.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/char/mwave/3780i.c 2005-09-27 17:50:32.000000000 +0200
@@ -53,6 +53,8 @@
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/sched.h> /* cond_resched() */
+
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/system.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_uar.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/infiniband/hw/mthca/mthca_uar.c 2005-09-27 17:50:32.000000000 +0200
@@ -32,6 +32,8 @@
* $Id$
*/
+#include <asm/page.h> /* PAGE_SHIFT */
+
#include "mthca_dev.h"
#include "mthca_memfree.h"
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/pciehprm_nonacpi.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/pci/hotplug/pciehprm_nonacpi.c 2005-09-27 17:50:32.000000000 +0200
@@ -33,10 +33,13 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <asm/uaccess.h>
#ifdef CONFIG_IA64
#include <asm/iosapic.h>
#endif
+
#include "pciehp.h"
#include "pciehprm.h"
#include "pciehprm_nonacpi.h"
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/shpchp.h 2005-09-27 17:23:32.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/pci/hotplug/shpchp.h 2005-09-27 17:50:32.000000000 +0200
@@ -32,8 +32,11 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/delay.h>
+#include <linux/sched.h> /* signal_pending(), struct timer_list */
+
#include <asm/semaphore.h>
#include <asm/io.h>
+
#include "pci_hotplug.h"
#if !defined(MODULE)
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/shpchprm_nonacpi.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/pci/hotplug/shpchprm_nonacpi.c 2005-09-27 17:50:32.000000000 +0200
@@ -33,10 +33,13 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <asm/uaccess.h>
#ifdef CONFIG_IA64
#include <asm/iosapic.h>
#endif
+
#include "shpchp.h"
#include "shpchprm.h"
#include "shpchprm_nonacpi.h"
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/usb/host/ohci-pci.c 2005-09-27 17:23:48.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/usb/host/ohci-pci.c 2005-09-27 17:50:32.000000000 +0200
@@ -14,6 +14,8 @@
* This file is licenced under the GPL.
*/
+#include <linux/jiffies.h>
+
#ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/include/linux/serial.h 2005-09-27 17:23:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/include/linux/serial.h 2005-09-27 17:50:32.000000000 +0200
@@ -11,6 +11,7 @@
#define _LINUX_SERIAL_H
#ifdef __KERNEL__
+#include <linux/types.h>
#include <asm/page.h>
/*
--- linux-2.6.14-rc2-mm1-sr-dj8/kernel/kprobes.c 2005-09-27 17:23:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/kernel/kprobes.c 2005-09-27 17:51:45.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/spinlock.h>
#include <linux/hash.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/moduleloader.h>
#include <asm-generic/sections.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/lib/vsprintf.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/lib/vsprintf.c 2005-09-27 17:50:32.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/ctype.h>
#include <linux/kernel.h>
+#include <asm/page.h> /* for PAGE_SIZE */
#include <asm/div64.h>
/**
[resent due to trailing whitespace breakage]
Fix more missing includes as a preparatory step for not including sched.h
from module.h. Together with the two previous patches this now covers
all architectures.
I'll let the patches settle before I push the patch to actually remove
sched.h inclusion from module.h.
Signed-off-by: Tim Schmielau <[email protected]>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/cris/arch-v10/drivers/axisflashmap.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/cris/arch-v10/drivers/axisflashmap.c 2005-09-27 17:50:32.000000000 +0200
@@ -140,6 +140,7 @@
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/concat.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/cris/arch-v32/drivers/axisflashmap.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/cris/arch-v32/drivers/axisflashmap.c 2005-09-27 17:50:32.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/concat.h>
#include <linux/mtd/map.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/cris/kernel/time.c 2005-09-27 17:23:30.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/cris/kernel/time.c 2005-09-27 17:50:32.000000000 +0200
@@ -31,6 +31,7 @@
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/profile.h>
+#include <linux/sched.h> /* just for sched_clock() - funny that */
u64 jiffies_64 = INITIAL_JIFFIES;
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/m32r/lib/csum_partial_copy.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/m32r/lib/csum_partial_copy.c 2005-09-27 17:50:32.000000000 +0200
@@ -18,10 +18,10 @@
#include <linux/module.h>
#include <linux/types.h>
+#include <linux/string.h>
#include <net/checksum.h>
#include <asm/byteorder.h>
-#include <asm/string.h>
#include <asm/uaccess.h>
/*
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/mips/sgi-ip27/ip27-berr.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/mips/sgi-ip27/ip27-berr.c 2005-09-27 17:50:32.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/signal.h> /* for SIGBUS */
#include <asm/module.h>
#include <asm/sn/addrs.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/ppc/syslib/of_device.c 2005-09-27 17:23:46.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/ppc/syslib/of_device.c 2005-09-27 17:50:32.000000000 +0200
@@ -4,6 +4,8 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+
#include <asm/errno.h>
#include <asm/of_device.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/sh/drivers/dma/dma-sysfs.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/sh/drivers/dma/dma-sysfs.c 2005-09-27 17:50:32.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/sysdev.h>
#include <linux/module.h>
+#include <linux/string.h>
#include <asm/dma.h>
static struct sysdev_class dma_sysclass = {
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/sh/kernel/cpufreq.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/sh/kernel/cpufreq.c 2005-09-27 17:50:32.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/delay.h>
#include <linux/cpumask.h>
#include <linux/smp.h>
+#include <linux/sched.h> /* set_cpus_allowed() */
#include <asm/processor.h>
#include <asm/watchdog.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/arch/xtensa/kernel/platform.c 2005-09-27 17:23:46.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/arch/xtensa/kernel/platform.c 2005-09-27 17:50:32.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/time.h>
#include <asm/platform.h>
#include <asm/timex.h>
+#include <asm/param.h> /* HZ */
#define _F(r,f,a,b) \
r __platform_##f a b; \
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/ali-agp.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/char/agp/ali-agp.c 2005-09-27 17:50:32.000000000 +0200
@@ -7,6 +7,7 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/agp_backend.h>
+#include <asm/page.h> /* PAGE_SIZE */
#include "agp.h"
#define ALI_AGPCTRL 0xb8
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/agp/amd64-agp.c 2005-09-27 17:23:31.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/char/agp/amd64-agp.c 2005-09-27 17:50:32.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/agp_backend.h>
+#include <asm/page.h> /* PAGE_SIZE */
#include "agp.h"
/* Will need to be increased if AMD64 ever goes >8-way. */
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/char/mwave/3780i.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/char/mwave/3780i.c 2005-09-27 17:50:32.000000000 +0200
@@ -53,6 +53,8 @@
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/sched.h> /* cond_resched() */
+
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/system.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/infiniband/hw/mthca/mthca_uar.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/infiniband/hw/mthca/mthca_uar.c 2005-09-27 17:50:32.000000000 +0200
@@ -32,6 +32,8 @@
* $Id$
*/
+#include <asm/page.h> /* PAGE_SHIFT */
+
#include "mthca_dev.h"
#include "mthca_memfree.h"
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/pciehprm_nonacpi.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/pci/hotplug/pciehprm_nonacpi.c 2005-09-27 17:50:32.000000000 +0200
@@ -33,10 +33,13 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <asm/uaccess.h>
#ifdef CONFIG_IA64
#include <asm/iosapic.h>
#endif
+
#include "pciehp.h"
#include "pciehprm.h"
#include "pciehprm_nonacpi.h"
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/shpchp.h 2005-09-27 17:23:32.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/pci/hotplug/shpchp.h 2005-09-27 17:50:32.000000000 +0200
@@ -32,8 +32,11 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/delay.h>
+#include <linux/sched.h> /* signal_pending(), struct timer_list */
+
#include <asm/semaphore.h>
#include <asm/io.h>
+
#include "pci_hotplug.h"
#if !defined(MODULE)
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/pci/hotplug/shpchprm_nonacpi.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/pci/hotplug/shpchprm_nonacpi.c 2005-09-27 17:50:32.000000000 +0200
@@ -33,10 +33,13 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <asm/uaccess.h>
#ifdef CONFIG_IA64
#include <asm/iosapic.h>
#endif
+
#include "shpchp.h"
#include "shpchprm.h"
#include "shpchprm_nonacpi.h"
--- linux-2.6.14-rc2-mm1-sr-dj8/drivers/usb/host/ohci-pci.c 2005-09-27 17:23:48.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/drivers/usb/host/ohci-pci.c 2005-09-27 17:50:32.000000000 +0200
@@ -14,6 +14,8 @@
* This file is licenced under the GPL.
*/
+#include <linux/jiffies.h>
+
#ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/include/linux/serial.h 2005-09-27 17:23:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/include/linux/serial.h 2005-09-27 17:50:32.000000000 +0200
@@ -11,6 +11,7 @@
#define _LINUX_SERIAL_H
#ifdef __KERNEL__
+#include <linux/types.h>
#include <asm/page.h>
/*
--- linux-2.6.14-rc2-mm1-sr-dj8/kernel/kprobes.c 2005-09-27 17:23:34.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/kernel/kprobes.c 2005-09-27 17:51:45.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/spinlock.h>
#include <linux/hash.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/moduleloader.h>
#include <asm-generic/sections.h>
--- linux-2.6.14-rc2-mm1-sr-dj8/lib/vsprintf.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.14-rc2-mm1-sr-dj9/lib/vsprintf.c 2005-09-27 17:50:32.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/ctype.h>
#include <linux/kernel.h>
+#include <asm/page.h> /* for PAGE_SIZE */
#include <asm/div64.h>
/**