From: Tim Schmielau <tim@physik3.uni-rostock.de>

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.

Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c       |    1 +
 arch/i386/kernel/cpu/cpufreq/p4-clockmod.c        |    1 +
 arch/i386/kernel/cpu/cpufreq/powernow-k8.c        |    1 +
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |    1 +
 arch/i386/kernel/cpu/intel_cacheinfo.c            |    1 +
 drivers/acpi/processor_idle.c                     |    1 +
 drivers/base/sys.c                                |    1 +
 drivers/block/paride/paride.c                     |    1 +
 drivers/block/paride/pg.c                         |    2 ++
 drivers/block/paride/pt.c                         |    1 +
 drivers/char/watchdog/cpu5wdt.c                   |    1 +
 drivers/char/watchdog/mixcomwd.c                  |    2 ++
 drivers/char/watchdog/pcwd.c                      |    2 +-
 drivers/char/watchdog/sc520_wdt.c                 |    1 +
 drivers/char/watchdog/softdog.c                   |    2 ++
 drivers/infiniband/core/cache.c                   |    1 +
 drivers/input/gameport/gameport.c                 |    1 +
 drivers/input/joystick/a3d.c                      |    1 +
 drivers/input/joystick/adi.c                      |    1 +
 drivers/input/joystick/analog.c                   |    1 +
 drivers/input/joystick/cobra.c                    |    1 +
 drivers/input/joystick/gf2k.c                     |    1 +
 drivers/input/joystick/grip.c                     |    1 +
 drivers/input/joystick/grip_mp.c                  |    1 +
 drivers/input/joystick/guillemot.c                |    1 +
 drivers/input/joystick/interact.c                 |    1 +
 drivers/input/joystick/sidewinder.c               |    1 +
 drivers/input/joystick/tmdc.c                     |    1 +
 drivers/input/serio/hp_sdc_mlc.c                  |    1 +
 drivers/isdn/capi/capifs.c                        |    1 +
 drivers/media/dvb/dvb-core/dvb_ca_en50221.c       |    1 +
 drivers/media/dvb/frontends/bcm3510.c             |    1 +
 drivers/media/dvb/frontends/s5h1420.c             |    2 ++
 drivers/media/dvb/frontends/stv0297.c             |    1 +
 drivers/media/dvb/frontends/stv0299.c             |    1 +
 drivers/media/dvb/frontends/tda1004x.c            |    1 +
 drivers/media/dvb/frontends/tda8083.c             |    1 +
 drivers/media/radio/miropcm20-rds.c               |    1 +
 drivers/mtd/mtdblock.c                            |    1 +
 drivers/mtd/mtdchar.c                             |    1 +
 drivers/mtd/mtdconcat.c                           |    2 +-
 drivers/scsi/scsi_transport_fc.c                  |    1 +
 drivers/usb/host/ohci-pxa27x.c                    |    1 +
 drivers/w1/w1_family.c                            |    1 +
 fs/filesystems.c                                  |    1 +
 fs/jffs2/background.c                             |    1 +
 fs/jffs2/wbuf.c                                   |    2 ++
 include/linux/cpufreq.h                           |    1 +
 include/linux/gameport.h                          |    1 +
 include/linux/i2c.h                               |    1 +
 include/linux/kobj_map.h                          |    2 ++
 include/pcmcia/ss.h                               |    1 +
 include/scsi/scsi_cmnd.h                          |    1 +
 include/scsi/scsi_transport_fc.h                  |    1 +
 kernel/kallsyms.c                                 |    1 +
 lib/smp_processor_id.c                            |    1 +
 sound/oss/ac97_codec.c                            |    1 +
 57 files changed, 63 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~fix-missing-includes arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- devel/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c	2005-10-11 00:34:51.000000000 -0700
@@ -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 -puN arch/i386/kernel/cpu/cpufreq/p4-clockmod.c~fix-missing-includes arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- devel/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN arch/i386/kernel/cpu/cpufreq/powernow-k8.c~fix-missing-includes arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- devel/arch/i386/kernel/cpu/cpufreq/powernow-k8.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~fix-missing-includes arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
--- devel/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN arch/i386/kernel/cpu/intel_cacheinfo.c~fix-missing-includes arch/i386/kernel/cpu/intel_cacheinfo.c
--- devel/arch/i386/kernel/cpu/intel_cacheinfo.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN drivers/acpi/processor_idle.c~fix-missing-includes drivers/acpi/processor_idle.c
--- devel/drivers/acpi/processor_idle.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/acpi/processor_idle.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN drivers/base/sys.c~fix-missing-includes drivers/base/sys.c
--- devel/drivers/base/sys.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/base/sys.c	2005-10-11 00:34:51.000000000 -0700
@@ -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;
 
diff -puN drivers/block/paride/paride.c~fix-missing-includes drivers/block/paride/paride.c
--- devel/drivers/block/paride/paride.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/block/paride/paride.c	2005-10-11 00:34:51.000000000 -0700
@@ -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
diff -puN drivers/block/paride/pg.c~fix-missing-includes drivers/block/paride/pg.c
--- devel/drivers/block/paride/pg.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/block/paride/pg.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/block/paride/pt.c~fix-missing-includes drivers/block/paride/pt.c
--- devel/drivers/block/paride/pt.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/block/paride/pt.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/char/watchdog/cpu5wdt.c~fix-missing-includes drivers/char/watchdog/cpu5wdt.c
--- devel/drivers/char/watchdog/cpu5wdt.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/char/watchdog/cpu5wdt.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/char/watchdog/mixcomwd.c~fix-missing-includes drivers/char/watchdog/mixcomwd.c
--- devel/drivers/char/watchdog/mixcomwd.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/char/watchdog/mixcomwd.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/char/watchdog/pcwd.c~fix-missing-includes drivers/char/watchdog/pcwd.c
--- devel/drivers/char/watchdog/pcwd.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/char/watchdog/pcwd.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/char/watchdog/sc520_wdt.c~fix-missing-includes drivers/char/watchdog/sc520_wdt.c
--- devel/drivers/char/watchdog/sc520_wdt.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/char/watchdog/sc520_wdt.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN drivers/char/watchdog/softdog.c~fix-missing-includes drivers/char/watchdog/softdog.c
--- devel/drivers/char/watchdog/softdog.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/char/watchdog/softdog.c	2005-10-11 00:34:51.000000000 -0700
@@ -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: "
diff -puN drivers/infiniband/core/cache.c~fix-missing-includes drivers/infiniband/core/cache.c
--- devel/drivers/infiniband/core/cache.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/infiniband/core/cache.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/input/gameport/gameport.c~fix-missing-includes drivers/input/gameport/gameport.c
--- devel/drivers/input/gameport/gameport.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/gameport/gameport.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>*/
 
diff -puN drivers/input/joystick/a3d.c~fix-missing-includes drivers/input/joystick/a3d.c
--- devel/drivers/input/joystick/a3d.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/a3d.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/adi.c~fix-missing-includes drivers/input/joystick/adi.c
--- devel/drivers/input/joystick/adi.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/adi.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/analog.c~fix-missing-includes drivers/input/joystick/analog.c
--- devel/drivers/input/joystick/analog.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/analog.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/input/joystick/cobra.c~fix-missing-includes drivers/input/joystick/cobra.c
--- devel/drivers/input/joystick/cobra.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/cobra.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/gf2k.c~fix-missing-includes drivers/input/joystick/gf2k.c
--- devel/drivers/input/joystick/gf2k.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/gf2k.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/grip.c~fix-missing-includes drivers/input/joystick/grip.c
--- devel/drivers/input/joystick/grip.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/grip.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/grip_mp.c~fix-missing-includes drivers/input/joystick/grip_mp.c
--- devel/drivers/input/joystick/grip_mp.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/grip_mp.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/guillemot.c~fix-missing-includes drivers/input/joystick/guillemot.c
--- devel/drivers/input/joystick/guillemot.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/guillemot.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/interact.c~fix-missing-includes drivers/input/joystick/interact.c
--- devel/drivers/input/joystick/interact.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/interact.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/sidewinder.c~fix-missing-includes drivers/input/joystick/sidewinder.c
--- devel/drivers/input/joystick/sidewinder.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/sidewinder.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/joystick/tmdc.c~fix-missing-includes drivers/input/joystick/tmdc.c
--- devel/drivers/input/joystick/tmdc.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/joystick/tmdc.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/input/serio/hp_sdc_mlc.c~fix-missing-includes drivers/input/serio/hp_sdc_mlc.c
--- devel/drivers/input/serio/hp_sdc_mlc.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/input/serio/hp_sdc_mlc.c	2005-10-11 00:34:51.000000000 -0700
@@ -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: "
 
diff -puN drivers/isdn/capi/capifs.c~fix-missing-includes drivers/isdn/capi/capifs.c
--- devel/drivers/isdn/capi/capifs.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/isdn/capi/capifs.c	2005-10-11 00:34:51.000000000 -0700
@@ -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");
diff -puN drivers/media/dvb/dvb-core/dvb_ca_en50221.c~fix-missing-includes drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- devel/drivers/media/dvb/dvb-core/dvb_ca_en50221.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/media/dvb/frontends/bcm3510.c~fix-missing-includes drivers/media/dvb/frontends/bcm3510.c
--- devel/drivers/media/dvb/frontends/bcm3510.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/bcm3510.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/media/dvb/frontends/s5h1420.c~fix-missing-includes drivers/media/dvb/frontends/s5h1420.c
--- devel/drivers/media/dvb/frontends/s5h1420.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/s5h1420.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/media/dvb/frontends/stv0297.c~fix-missing-includes drivers/media/dvb/frontends/stv0297.c
--- devel/drivers/media/dvb/frontends/stv0297.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/stv0297.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/media/dvb/frontends/stv0299.c~fix-missing-includes drivers/media/dvb/frontends/stv0299.c
--- devel/drivers/media/dvb/frontends/stv0299.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/stv0299.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/media/dvb/frontends/tda1004x.c~fix-missing-includes drivers/media/dvb/frontends/tda1004x.c
--- devel/drivers/media/dvb/frontends/tda1004x.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/tda1004x.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/media/dvb/frontends/tda8083.c~fix-missing-includes drivers/media/dvb/frontends/tda8083.c
--- devel/drivers/media/dvb/frontends/tda8083.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/tda8083.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
 
diff -puN drivers/media/radio/miropcm20-rds.c~fix-missing-includes drivers/media/radio/miropcm20-rds.c
--- devel/drivers/media/radio/miropcm20-rds.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/media/radio/miropcm20-rds.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN drivers/mtd/mtdblock.c~fix-missing-includes drivers/mtd/mtdblock.c
--- devel/drivers/mtd/mtdblock.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/mtd/mtdblock.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/mtd/mtdchar.c~fix-missing-includes drivers/mtd/mtdchar.c
--- devel/drivers/mtd/mtdchar.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/mtd/mtdchar.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN drivers/mtd/mtdconcat.c~fix-missing-includes drivers/mtd/mtdconcat.c
--- devel/drivers/mtd/mtdconcat.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/mtd/mtdconcat.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
diff -puN drivers/scsi/scsi_transport_fc.c~fix-missing-includes drivers/scsi/scsi_transport_fc.c
--- devel/drivers/scsi/scsi_transport_fc.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/scsi/scsi_transport_fc.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN drivers/usb/host/ohci-pxa27x.c~fix-missing-includes drivers/usb/host/ohci-pxa27x.c
--- devel/drivers/usb/host/ohci-pxa27x.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/usb/host/ohci-pxa27x.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN drivers/w1/w1_family.c~fix-missing-includes drivers/w1/w1_family.c
--- devel/drivers/w1/w1_family.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/drivers/w1/w1_family.c	2005-10-11 00:34:51.000000000 -0700
@@ -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"
diff -puN fs/filesystems.c~fix-missing-includes fs/filesystems.c
--- devel/fs/filesystems.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/fs/filesystems.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
 
 /*
diff -puN fs/jffs2/background.c~fix-missing-includes fs/jffs2/background.c
--- devel/fs/jffs2/background.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/fs/jffs2/background.c	2005-10-11 00:34:51.000000000 -0700
@@ -15,6 +15,7 @@
 #include <linux/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
+#include <linux/sched.h>
 #include "nodelist.h"
 
 
diff -puN fs/jffs2/wbuf.c~fix-missing-includes fs/jffs2/wbuf.c
--- devel/fs/jffs2/wbuf.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/fs/jffs2/wbuf.c	2005-10-11 00:34:51.000000000 -0700
@@ -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 */
diff -puN include/linux/cpufreq.h~fix-missing-includes include/linux/cpufreq.h
--- devel/include/linux/cpufreq.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/linux/cpufreq.h	2005-10-11 00:34:51.000000000 -0700
@@ -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
 
diff -puN include/linux/gameport.h~fix-missing-includes include/linux/gameport.h
--- devel/include/linux/gameport.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/linux/gameport.h	2005-10-11 00:34:51.000000000 -0700
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/list.h>
 #include <linux/device.h>
+#include <linux/timer.h>
 
 struct gameport {
 
diff -puN include/linux/i2c.h~fix-missing-includes include/linux/i2c.h
--- devel/include/linux/i2c.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/linux/i2c.h	2005-10-11 00:34:51.000000000 -0700
@@ -33,6 +33,7 @@
 #include <linux/i2c-id.h>
 #include <linux/mod_devicetable.h>
 #include <linux/device.h>	/* for struct device */
+#include <linux/sched.h>	/* for completion */
 #include <asm/semaphore.h>
 
 /* --- For i2c-isa ---------------------------------------------------- */
diff -puN include/linux/kobj_map.h~fix-missing-includes include/linux/kobj_map.h
--- devel/include/linux/kobj_map.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/linux/kobj_map.h	2005-10-11 00:34:51.000000000 -0700
@@ -1,5 +1,7 @@
 #ifdef __KERNEL__
 
+#include <asm/semaphore.h>
+
 typedef struct kobject *kobj_probe_t(dev_t, int *, void *);
 struct kobj_map;
 
diff -puN include/pcmcia/ss.h~fix-missing-includes include/pcmcia/ss.h
--- devel/include/pcmcia/ss.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/pcmcia/ss.h	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN include/scsi/scsi_cmnd.h~fix-missing-includes include/scsi/scsi_cmnd.h
--- devel/include/scsi/scsi_cmnd.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/scsi/scsi_cmnd.h	2005-10-11 00:34:51.000000000 -0700
@@ -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;
diff -puN include/scsi/scsi_transport_fc.h~fix-missing-includes include/scsi/scsi_transport_fc.h
--- devel/include/scsi/scsi_transport_fc.h~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/include/scsi/scsi_transport_fc.h	2005-10-11 00:34:51.000000000 -0700
@@ -28,6 +28,7 @@
 #define SCSI_TRANSPORT_FC_H
 
 #include <linux/config.h>
+#include <linux/sched.h>	/* work_struct */
 
 struct scsi_transport_template;
 
diff -puN kernel/kallsyms.c~fix-missing-includes kernel/kallsyms.c
--- devel/kernel/kallsyms.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/kernel/kallsyms.c	2005-10-11 00:34:51.000000000 -0700
@@ -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>
diff -puN lib/smp_processor_id.c~fix-missing-includes lib/smp_processor_id.c
--- devel/lib/smp_processor_id.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/lib/smp_processor_id.c	2005-10-11 00:34:51.000000000 -0700
@@ -5,6 +5,7 @@
  */
 #include <linux/module.h>
 #include <linux/kallsyms.h>
+#include <linux/sched.h>
 
 unsigned int debug_smp_processor_id(void)
 {
diff -puN sound/oss/ac97_codec.c~fix-missing-includes sound/oss/ac97_codec.c
--- devel/sound/oss/ac97_codec.c~fix-missing-includes	2005-10-11 00:34:51.000000000 -0700
+++ devel-akpm/sound/oss/ac97_codec.c	2005-10-11 00:34:51.000000000 -0700
@@ -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
 
_