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

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 <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/cris/arch-v10/drivers/axisflashmap.c |    1 +
 arch/cris/arch-v32/drivers/axisflashmap.c |    1 +
 arch/cris/kernel/time.c                   |    1 +
 arch/m32r/lib/csum_partial_copy.c         |    2 +-
 arch/mips/sgi-ip27/ip27-berr.c            |    1 +
 arch/ppc/syslib/of_device.c               |    2 ++
 arch/sh/drivers/dma/dma-sysfs.c           |    1 +
 arch/sh/kernel/cpufreq.c                  |    1 +
 arch/xtensa/kernel/platform.c             |    1 +
 drivers/char/agp/ali-agp.c                |    1 +
 drivers/char/agp/amd64-agp.c              |    1 +
 drivers/char/mwave/3780i.c                |    2 ++
 drivers/infiniband/hw/mthca/mthca_uar.c   |    2 ++
 drivers/pci/hotplug/pciehprm_nonacpi.c    |    3 +++
 drivers/pci/hotplug/shpchp.h              |    3 +++
 drivers/pci/hotplug/shpchprm_nonacpi.c    |    3 +++
 drivers/usb/host/ohci-pci.c               |    2 ++
 include/linux/serial.h                    |    1 +
 kernel/kprobes.c                          |    1 +
 lib/vsprintf.c                            |    1 +
 20 files changed, 30 insertions(+), 1 deletion(-)

diff -puN arch/cris/arch-v10/drivers/axisflashmap.c~fix-even-more-missing-includes arch/cris/arch-v10/drivers/axisflashmap.c
--- devel/arch/cris/arch-v10/drivers/axisflashmap.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/cris/arch-v10/drivers/axisflashmap.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN arch/cris/arch-v32/drivers/axisflashmap.c~fix-even-more-missing-includes arch/cris/arch-v32/drivers/axisflashmap.c
--- devel/arch/cris/arch-v32/drivers/axisflashmap.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/cris/arch-v32/drivers/axisflashmap.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN arch/cris/kernel/time.c~fix-even-more-missing-includes arch/cris/kernel/time.c
--- devel/arch/cris/kernel/time.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/cris/kernel/time.c	2005-09-28 00:08:41.000000000 -0700
@@ -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;
 
diff -puN arch/m32r/lib/csum_partial_copy.c~fix-even-more-missing-includes arch/m32r/lib/csum_partial_copy.c
--- devel/arch/m32r/lib/csum_partial_copy.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/m32r/lib/csum_partial_copy.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
 
 /*
diff -puN arch/mips/sgi-ip27/ip27-berr.c~fix-even-more-missing-includes arch/mips/sgi-ip27/ip27-berr.c
--- devel/arch/mips/sgi-ip27/ip27-berr.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/mips/sgi-ip27/ip27-berr.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN arch/ppc/syslib/of_device.c~fix-even-more-missing-includes arch/ppc/syslib/of_device.c
--- devel/arch/ppc/syslib/of_device.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/ppc/syslib/of_device.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
 
diff -puN arch/sh/drivers/dma/dma-sysfs.c~fix-even-more-missing-includes arch/sh/drivers/dma/dma-sysfs.c
--- devel/arch/sh/drivers/dma/dma-sysfs.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/sh/drivers/dma/dma-sysfs.c	2005-09-28 00:08:41.000000000 -0700
@@ -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 = {
diff -puN arch/sh/kernel/cpufreq.c~fix-even-more-missing-includes arch/sh/kernel/cpufreq.c
--- devel/arch/sh/kernel/cpufreq.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/sh/kernel/cpufreq.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN arch/xtensa/kernel/platform.c~fix-even-more-missing-includes arch/xtensa/kernel/platform.c
--- devel/arch/xtensa/kernel/platform.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/arch/xtensa/kernel/platform.c	2005-09-28 00:08:41.000000000 -0700
@@ -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;                                   	\
diff -puN drivers/char/agp/ali-agp.c~fix-even-more-missing-includes drivers/char/agp/ali-agp.c
--- devel/drivers/char/agp/ali-agp.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/char/agp/ali-agp.c	2005-09-28 00:08:41.000000000 -0700
@@ -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
diff -puN drivers/char/agp/amd64-agp.c~fix-even-more-missing-includes drivers/char/agp/amd64-agp.c
--- devel/drivers/char/agp/amd64-agp.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/char/agp/amd64-agp.c	2005-09-28 00:08:41.000000000 -0700
@@ -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. */
diff -puN drivers/char/mwave/3780i.c~fix-even-more-missing-includes drivers/char/mwave/3780i.c
--- devel/drivers/char/mwave/3780i.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/char/mwave/3780i.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN drivers/infiniband/hw/mthca/mthca_uar.c~fix-even-more-missing-includes drivers/infiniband/hw/mthca/mthca_uar.c
--- devel/drivers/infiniband/hw/mthca/mthca_uar.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_uar.c	2005-09-28 00:08:41.000000000 -0700
@@ -32,6 +32,8 @@
  * $Id$
  */
 
+#include <asm/page.h>		/* PAGE_SHIFT */
+
 #include "mthca_dev.h"
 #include "mthca_memfree.h"
 
diff -puN drivers/pci/hotplug/pciehprm_nonacpi.c~fix-even-more-missing-includes drivers/pci/hotplug/pciehprm_nonacpi.c
--- devel/drivers/pci/hotplug/pciehprm_nonacpi.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-09-28 00:08:41.000000000 -0700
@@ -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"
diff -puN drivers/pci/hotplug/shpchp.h~fix-even-more-missing-includes drivers/pci/hotplug/shpchp.h
--- devel/drivers/pci/hotplug/shpchp.h~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/shpchp.h	2005-09-28 00:08:41.000000000 -0700
@@ -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)
diff -puN drivers/pci/hotplug/shpchprm_nonacpi.c~fix-even-more-missing-includes drivers/pci/hotplug/shpchprm_nonacpi.c
--- devel/drivers/pci/hotplug/shpchprm_nonacpi.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/shpchprm_nonacpi.c	2005-09-28 00:08:41.000000000 -0700
@@ -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"
diff -puN drivers/usb/host/ohci-pci.c~fix-even-more-missing-includes drivers/usb/host/ohci-pci.c
--- devel/drivers/usb/host/ohci-pci.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/drivers/usb/host/ohci-pci.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN include/linux/serial.h~fix-even-more-missing-includes include/linux/serial.h
--- devel/include/linux/serial.h~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/include/linux/serial.h	2005-09-28 00:08:41.000000000 -0700
@@ -11,6 +11,7 @@
 #define _LINUX_SERIAL_H
 
 #ifdef __KERNEL__
+#include <linux/types.h>
 #include <asm/page.h>
 
 /*
diff -puN kernel/kprobes.c~fix-even-more-missing-includes kernel/kprobes.c
--- devel/kernel/kprobes.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/kernel/kprobes.c	2005-09-28 00:08:41.000000000 -0700
@@ -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>
diff -puN lib/vsprintf.c~fix-even-more-missing-includes lib/vsprintf.c
--- devel/lib/vsprintf.c~fix-even-more-missing-includes	2005-09-28 00:08:41.000000000 -0700
+++ devel-akpm/lib/vsprintf.c	2005-09-28 00:08:41.000000000 -0700
@@ -23,6 +23,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 
+#include <asm/page.h>		/* for PAGE_SIZE */
 #include <asm/div64.h>
 
 /**
_