[PATCH] jiffies.h

Trivial patch update against 2.5.17:
Tim Schmielau <tim@physik3.uni-rostock.de>: move jiffies from sched.h to it's own jiffies.h:
  Move 'jiffies' from sched.h to their own header.
  Then pull the sched.h dependency from 67 files that include sched.h for
  no apparent reason other than the jiffies declaration.

  Move the time_[before,after}{_eq}() macros from timer.h to jiffies.h,
  since there are *no* files using them that don't also use jiffies.

  Many more sched.h dependencies can be killed after capable(),
  request_irq(), and free_irq() are moved out of <linux/sched.h>.

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

diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c
index 4b46e0e003fb65daf392494ae6f5fe6b431b61f7..ed786f64da2ef5d8e2b66fad596a19eeca0b2927 100644 (file)
--- a/Documentation/DocBook/procfs_example.c
+++ b/Documentation/DocBook/procfs_example.c
@@ -47,7 +47,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <asm/uaccess.h>
 
 

diff --git a/arch/i386/kernel/bluesmoke.c b/arch/i386/kernel/bluesmoke.c
index 11f8296919b8c9e0f2f1bfb35a416f13ef302ea6..84933b92e7f53797c79dee0fa5990f98bc169481 100644 (file)
--- a/arch/i386/kernel/bluesmoke.c
+++ b/arch/i386/kernel/bluesmoke.c
@@ -5,7 +5,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/smp.h>
 #include <linux/config.h>
 #include <linux/irq.h>

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index fe2ef585b4932ec6349678afd7f040c49e35748b..615cbbb59536ebb02222f79d0b984b92f126177f 100644 (file)
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -14,7 +14,7 @@
 
 #include <linux/config.h>
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>

diff --git a/arch/ia64/sn/kernel/mca.c b/arch/ia64/sn/kernel/mca.c
index 02a14c3f9b0016fe4ed69f2b16c75393d9c055e7..5b3e0e1e9fd1f327fe74fba5aef6e6f2fa659ba9 100644 (file)
--- a/arch/ia64/sn/kernel/mca.c
+++ b/arch/ia64/sn/kernel/mca.c
@@ -35,7 +35,7 @@
 
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/threads.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>

diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c
index fd110d2d990c214735d3c0c2d62fff5df77a2bb4..efec739136fe97e4da5e87a6d3d0854cb39a713b 100644 (file)
--- a/arch/m68k/amiga/amisound.c
+++ b/arch/m68k/amiga/amisound.c
@@ -9,7 +9,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/init.h>
 

diff --git a/arch/m68k/amiga/pcmcia.c b/arch/m68k/amiga/pcmcia.c
index e503a5a9533a9df7b00440e489b116c5f15a7265..fc57c6e72acf10d2bd30997f25cc222488f07813 100644 (file)
--- a/arch/m68k/amiga/pcmcia.c
+++ b/arch/m68k/amiga/pcmcia.c
@@ -13,7 +13,7 @@
 */
 
 #include <linux/types.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <asm/amigayle.h>
 #include <asm/amipcmcia.h>

diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index 95097695d6ef683103c9d83f6dd8a0fe1155ab1a..18184bcd9c2d6a86e4f941c19de418ac7a424699 100644 (file)
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -1,6 +1,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/kernel_stat.h>
 
 #include <asm/system.h>

diff --git a/arch/mips/jazz/reset.c b/arch/mips/jazz/reset.c
index f1aac5388ad3b38f34995453827d0242a56c6057..b930afed303d8f4728c59fdd55880a4c64f7622f 100644 (file)
--- a/arch/mips/jazz/reset.c
+++ b/arch/mips/jazz/reset.c
@@ -6,7 +6,7 @@
  *  $Id:$
  */
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <asm/jazz.h>
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/arch/ppc/kernel/temp.c b/arch/ppc/kernel/temp.c
index 6af5375142b52d42dc62308fbfd15239e53c83c6..33b3dee67338a2317ca3ec8594abe0045b66c944 100644 (file)
--- a/arch/ppc/kernel/temp.c
+++ b/arch/ppc/kernel/temp.c
@@ -13,7 +13,7 @@
 
 #include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <linux/string.h>

diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c
index 15a372db13b08877303911ddd73a31569b6c1e6a..ba3b4e81a1f5d71da0c894611319844a012e8f99 100644 (file)
--- a/arch/sparc64/kernel/central.c
+++ b/arch/sparc64/kernel/central.c
@@ -8,7 +8,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/timer.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>

diff --git a/arch/x86_64/kernel/bluesmoke.c b/arch/x86_64/kernel/bluesmoke.c
index 80f48c54d50ba875c1d8d5ff2ee7a2853c68c43e..f92ef7cdeb1a3f5be142ccab3632e97614a7c12f 100644 (file)
--- a/arch/x86_64/kernel/bluesmoke.c
+++ b/arch/x86_64/kernel/bluesmoke.c
@@ -5,7 +5,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/smp.h>
 #include <linux/config.h>
 #include <linux/irq.h>

diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index 3d7605c1fd6dfc488289d301038b4cc4f438071c..6e9f3dc74332574bba347327a9e70afa51a58854 100644 (file)
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -4,7 +4,7 @@
 
 
 #include <linux/module.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/errno.h>

diff --git a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
index 822e16d070c0b02c63adcfc2f3e35a3e68fc2523..a28a2ab1dafb4762d55c6af8047695c79cf29e45 100644 (file)
--- a/drivers/char/agp/agpgart_be.c
+++ b/drivers/char/agp/agpgart_be.c
@@ -28,7 +28,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 02bdb661252ca243f4634aeceb9abbff89096a72..780942105b040eb5d617f12c2fdb6d4f85b76261 100644 (file)
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -50,7 +50,7 @@
 #include <linux/pci.h>
 #include <linux/wrapper.h>
 #include <linux/version.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/smp_lock.h>    /* For (un)lock_kernel */
 #include <linux/mm.h>
 #if defined(__alpha__) || defined(__powerpc__)

diff --git a/drivers/char/ftape/lowlevel/ftape-calibr.c b/drivers/char/ftape/lowlevel/ftape-calibr.c
index e21e6d2419cc88525560a661f3e20c3aeeb302bb..1c9de0eed8428b49e33f21e8d0218e491515240e 100644 (file)
--- a/drivers/char/ftape/lowlevel/ftape-calibr.c
+++ b/drivers/char/ftape/lowlevel/ftape-calibr.c
@@ -26,7 +26,7 @@
 
 #include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #if defined(__alpha__)

diff --git a/drivers/char/machzwd.c b/drivers/char/machzwd.c
index 4145913cf5fcf029b5f63f02e1a3270ad77fc778..eabf3fe878a22161655a7ed7df7e72a86318e26c 100644 (file)
--- a/drivers/char/machzwd.c
+++ b/drivers/char/machzwd.c
@@ -35,7 +35,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/slab.h>

diff --git a/drivers/char/sbc60xxwdt.c b/drivers/char/sbc60xxwdt.c
index ac7aeda9bfb5d73d2903b7a4897e5edc8dd0eed4..4088533440239fd0d56eccc3e3d3c79be13c4a8d 100644 (file)
--- a/drivers/char/sbc60xxwdt.c
+++ b/drivers/char/sbc60xxwdt.c
@@ -61,7 +61,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/slab.h>

diff --git a/drivers/char/w83877f_wdt.c b/drivers/char/w83877f_wdt.c
index 0f1b815ecbc5da2c61dbbf740088be228e298417..c2237e0ec1b5f6cdd36082cbc9bf440ded6d56c9 100644 (file)
--- a/drivers/char/w83877f_wdt.c
+++ b/drivers/char/w83877f_wdt.c
@@ -46,7 +46,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/slab.h>

diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index f4691f9662f311f6986bf838d5c65232147e8298..885be2e77623eda8c087571233810847ac869211 100644 (file)
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -23,7 +23,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>

diff --git a/drivers/ide/ide-pmac.c b/drivers/ide/ide-pmac.c
index 6ddd94b1b547f1835fad11fd075a16eb1f1db3f0..41808eb43ecad7ff7bba88a14adf67aa2b82ea52 100644 (file)
--- a/drivers/ide/ide-pmac.c
+++ b/drivers/ide/ide-pmac.c
@@ -33,7 +33,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/ide.h>

diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index a14399223c851edab4deb20c4b6fc40029a1b4fa..a25603a79897b7d48ee2334563d181f29de1bbc1 100644 (file)
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -38,7 +38,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/delay.h>

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 011d48b212a37f57505828c15a254df0dedde304..9c32bfc7bd09991952de0b553c5206a921ae4347 100644 (file)
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -61,7 +61,7 @@
 /*#define PSYCHO_DEBUG */
 
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/string.h>

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 06e0746a90610aa061f4c04f4bfb173cd599e5fb..31a5dcd3cfce92a8d854603903c1e4341709ee4f 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -52,7 +52,7 @@ static const char version[] =
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/ptrace.h>

diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c
index 2994d6f73099147db01cfab861036a6d7f70fe7a..e2a4a87fd8a74c775ae0eb4a8fa61a80a6fdc2c4 100644 (file)
--- a/drivers/net/atari_bionet.c
+++ b/drivers/net/atari_bionet.c
@@ -86,7 +86,7 @@ static char version[] =
 
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/atari_pamsnet.c b/drivers/net/atari_pamsnet.c
index 175c23466a73652efbfb3d7a7071f9552a8cf2c1..3b583c453914017afe001f6975390c9bc24034b9 100644 (file)
--- a/drivers/net/atari_pamsnet.c
+++ b/drivers/net/atari_pamsnet.c
@@ -80,7 +80,7 @@ static char *version =
 #include <linux/module.h>
 
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/auto_irq.c b/drivers/net/auto_irq.c
index f2fba5074295382b7697c98a7f5af4760a29ba29..96ddc77b719360bb1f23d88312d9da675537dcea 100644 (file)
--- a/drivers/net/auto_irq.c
+++ b/drivers/net/auto_irq.c
@@ -31,7 +31,7 @@ static const char *version=
 #endif
 
 #include <linux/module.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <asm/bitops.h>
 #include <asm/io.h>

diff --git a/drivers/net/ethertap.c b/drivers/net/ethertap.c
index 6bb635be09c9f6ae50a0a18c4430824d545bdd6f..ca38587fefab700f20c1a03c401c995ef3027d67 100644 (file)
--- a/drivers/net/ethertap.c
+++ b/drivers/net/ethertap.c
@@ -15,7 +15,7 @@
 #include <linux/module.h>
 
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index de0c5322d5b1d044b4d030ff1d4f873d60595181..4ae862f66b7f48b170facffba15acaa76820516d 100644 (file)
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -29,7 +29,7 @@
  *             2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/types.h>

diff --git a/drivers/net/wan/comx-proto-fr.c b/drivers/net/wan/comx-proto-fr.c
index bd3f996e3aa9d8682643e9293c9ec96669ef794b..4460b6a3cea6d647b2fb2f894f7ad1c72aea887c 100644 (file)
--- a/drivers/net/wan/comx-proto-fr.c
+++ b/drivers/net/wan/comx-proto-fr.c
@@ -39,7 +39,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/types.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/if_arp.h>

diff --git a/drivers/net/wan/comx-proto-ppp.c b/drivers/net/wan/comx-proto-ppp.c
index 5610c736fa0282220475f17b03e1878a03d8181f..4153b9dd63c00962e27ea92c276df90fbd6ed011 100644 (file)
--- a/drivers/net/wan/comx-proto-ppp.c
+++ b/drivers/net/wan/comx-proto-ppp.c
@@ -36,7 +36,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/types.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/if_arp.h>

diff --git a/drivers/net/wan/comx.c b/drivers/net/wan/comx.c
index 71da5c7776ff0bad027070877071bb1c2ec0ffd6..739c19d39b37ee32dced9e4f40ca08fbc6133e61 100644 (file)
--- a/drivers/net/wan/comx.c
+++ b/drivers/net/wan/comx.c
@@ -58,7 +58,7 @@
 #include <linux/version.h>
 
 #include <linux/types.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c
index cd2645791d1eab55b254b413827909db3c19d918..a96c3cce01579df32c13e8e3a72383d6cebd4ca4 100644 (file)
--- a/drivers/net/wan/hd6457x.c
+++ b/drivers/net/wan/hd6457x.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
index be2b7f78b1c709e9607427944ec7c5fd753cf813..151fd7b90a16d5a2383d11bed077ab6e4e5a01a9 100644 (file)
--- a/drivers/net/wan/sdladrv.c
+++ b/drivers/net/wan/sdladrv.c
@@ -97,7 +97,7 @@
 #include <linux/errno.h>       /* return codes */
 #include <linux/string.h>      /* inline memset(), etc. */
 #include <linux/module.h>      /* support for loadable modules */
-#include <linux/sched.h>       /* for jiffies, HZ, etc. */
+#include <linux/jiffies.h>     /* for jiffies, HZ, etc. */
 #include <linux/sdladrv.h>     /* API definitions */
 #include <linux/sdlasfm.h>     /* SDLA firmware module definitions */
 #include <linux/sdlapci.h>     /* SDLA PCI hardware definitions */

diff --git a/drivers/scsi/i60uscsi.c b/drivers/scsi/i60uscsi.c
index 13699ad53eb3d988057ce22dda93d3a7b54974bc..732533329cabb9e5590507902c4fc8cca8248b16 100644 (file)
--- a/drivers/scsi/i60uscsi.c
+++ b/drivers/scsi/i60uscsi.c
@@ -69,7 +69,7 @@
  **************************************************************************/
 
 #include <linux/version.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include "i60uscsi.h"
 

diff --git a/drivers/scsi/i91uscsi.c b/drivers/scsi/i91uscsi.c
index 0b7739a51575e1acdbce52f4df63ef85b7d0465e..ee7e36d9ec851d5668a1cb6dc79bfb5f8cc5e9cd 100644 (file)
--- a/drivers/scsi/i91uscsi.c
+++ b/drivers/scsi/i91uscsi.c
@@ -88,7 +88,7 @@
 #include <linux/version.h>
 #endif
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/blk.h>
 #include <asm/io.h>

diff --git a/drivers/usb/host/usb-uhci-hcd.c b/drivers/usb/host/usb-uhci-hcd.c
index c970c4a36bf86c080c7c19c8ef1749ec06fdecc4..fd20be97874760179d7924a3f4bdb6e873a3532c 100644 (file)
--- a/drivers/usb/host/usb-uhci-hcd.c
+++ b/drivers/usb/host/usb-uhci-hcd.c
@@ -22,7 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/errno.h>

diff --git a/drivers/usb/net/cdc-ether.c b/drivers/usb/net/cdc-ether.c
index db03b9df96957bc7d70302811c2a5b35a2e2e90a..c257e9185dcf1a78500d10274f070b983c101ee2 100644 (file)
--- a/drivers/usb/net/cdc-ether.c
+++ b/drivers/usb/net/cdc-ether.c
@@ -19,7 +19,7 @@
  */
 
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>

diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index ba87e2285d7e38016bc664601ce65ac7204a9232..1625226022af54c532c4e3c8279341a2d375fe7c 100644 (file)
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -49,7 +49,7 @@
 #include "scsiglue.h"
 #include "isd200.h"
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/hdreg.h>

diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index e0a31fc586351597726ca87e1b0083311e744464..ce3642144062e41a5b03ffcc133f291e4c32d9e7 100644 (file)
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -31,7 +31,7 @@
 #include "debug.h"
 #include "sddr55.h"
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 

diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c
index ad8d4ffcb30101a39c161c683f5060f311310461..25758acea219fac841bc95d5f6dda48f656d9dc3 100644 (file)
--- a/fs/vfat/namei.c
+++ b/fs/vfat/namei.c
@@ -17,7 +17,7 @@
 
 #include <linux/module.h>
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/msdos_fs.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>

diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
new file mode 100644 (file)
index 0000000..a33b2bc
--- /dev/null
+++ b/include/linux/jiffies.h
@@ -0,0 +1,30 @@
+#ifndef _LINUX_JIFFIES_H
+#define _LINUX_JIFFIES_H
+
+/*
+ * The 64-bit value is not volatile - you MUST NOT read it
+ * without holding read_lock_irq(&xtime_lock)
+ */
+extern u64 jiffies_64;
+extern unsigned long volatile jiffies;
+
+/*
+ *     These inlines deal with timer wrapping correctly. You are 
+ *     strongly encouraged to use them
+ *     1. Because people otherwise forget
+ *     2. Because if the timer wrap changes in future you wont have to
+ *        alter your driver code.
+ *
+ * time_after(a,b) returns true if the time a is after time b.
+ *
+ * Do this with "<0" and ">=0" to only test the sign of the result. A
+ * good compiler would generate better code (and a really good compiler
+ * wouldn't care). Gcc is currently neither.
+ */
+#define time_after(a,b)                ((long)(b) - (long)(a) < 0)
+#define time_before(a,b)       time_after(b,a)
+
+#define time_after_eq(a,b)     ((long)(a) - (long)(b) >= 0)
+#define time_before_eq(a,b)    time_after_eq(b,a)
+
+#endif

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 067c93387b770037e94bfcdb0b89cd5cd9c51ed0..743b1aea2acaed45950cbe521f7b91c5aec6c994 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -13,6 +13,7 @@ extern unsigned long event;
 #include <linux/types.h>
 #include <linux/times.h>
 #include <linux/timex.h>
+#include <linux/jiffies.h>
 #include <linux/rbtree.h>
 #include <linux/thread_info.h>
 
@@ -481,12 +482,6 @@ extern void free_uid(struct user_struct *);
 
 #include <asm/current.h>
 
-/*
- * The 64-bit value is not volatile - you MUST NOT read it
- * without holding read_lock_irq(&xtime_lock)
- */
-extern u64 jiffies_64;
-extern unsigned long volatile jiffies;
 extern unsigned long itimer_ticks;
 extern unsigned long itimer_next;
 extern void do_timer(struct pt_regs *);

diff --git a/include/linux/timer.h b/include/linux/timer.h
index c4f01ada5975c3dd3becd41de4891cf9f9ebffee..d6f0ce5f8740b6057689e0ad62559cac95d44700 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -52,23 +52,4 @@ static inline int timer_pending (const struct timer_list * timer)
        return timer->list.next != NULL;
 }
 
-/*
- *     These inlines deal with timer wrapping correctly. You are 
- *     strongly encouraged to use them
- *     1. Because people otherwise forget
- *     2. Because if the timer wrap changes in future you wont have to
- *        alter your driver code.
- *
- * time_after(a,b) returns true if the time a is after time b.
- *
- * Do this with "<0" and ">=0" to only test the sign of the result. A
- * good compiler would generate better code (and a really good compiler
- * wouldn't care). Gcc is currently neither.
- */
-#define time_after(a,b)                ((long)(b) - (long)(a) < 0)
-#define time_before(a,b)       time_after(b,a)
-
-#define time_after_eq(a,b)     ((long)(a) - (long)(b) >= 0)
-#define time_before_eq(a,b)    time_after_eq(b,a)
-
 #endif

diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index f71621990094bb0cb511db9f6ed9bd1089df7760..33105051f30436a16a51e99414649db72f9bbc5b 100644 (file)
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
 

diff --git a/net/802/tr.c b/net/802/tr.c
index 73c9384864090db2b5f3d79bb2050d6f2f518b6d..6249e319efab0ccfd1916c2190374fa247b16d3d 100644 (file)
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -20,7 +20,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>

diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c
index b11045192e07665f818e9550ebf41aa5857524b0..02c189e4cb11e9ee01ab0a128d5f8bc4f6d776dd 100644 (file)
--- a/net/ax25/ax25_ds_timer.c
+++ b/net/ax25/ax25_ds_timer.c
@@ -20,7 +20,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c
index 01e7596f3d3a5249b4c13e02ea0f18e3d69f39da..8ea87b01df41703912d6ddcb15730b7a620ef2b2 100644 (file)
--- a/net/ax25/ax25_timer.c
+++ b/net/ax25/ax25_timer.c
@@ -31,7 +31,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/core/profile.c b/net/core/profile.c
index a3ff364175ec319fb1c9aad887c3b446313f090b..403556b6c7450c02cb5acde14c76833ca62d07c4 100644 (file)
--- a/net/core/profile.c
+++ b/net/core/profile.c
@@ -1,7 +1,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>

diff --git a/net/core/utils.c b/net/core/utils.c
index 3103934531810fb62d8cde8ff52bb4d7e74f0c31..6a69fe47f48305f89b53ff5f53b5210ba41e653a 100644 (file)
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -17,7 +17,7 @@
 #include <asm/system.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 3c75a6577ea141c9d73d8ee83510ed89366d6fac..071b4af2b05b611f6699c6baacb901e789bc8386 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -21,7 +21,7 @@
 #include <asm/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/socket.h>

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index a5b7dbb0d0e1ca85583ed8cd7ad804075d317d12..b9966cb78cae61c75f1248c7c4b4d31efc0baaa3 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -65,7 +65,7 @@
 
 #include <linux/config.h>
 #include <linux/types.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/fcntl.h>
 #include <linux/socket.h>

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index de716fe63d790c462842e5c781e718703fc0571b..1ac00c0c296e71bacf4c0eb1aa4ef718b4b7670a 100644 (file)
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -76,7 +76,7 @@
 #include <asm/system.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/socket.h>
 #include <linux/sockios.h>

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 6ecca31225827facc102d4156dfa06f0a7a889b5..041dc0a89142b9eef1bce05b1b08753ee70d34b5 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -24,7 +24,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/skbuff.h>
 #include <linux/ip.h>
 #include <linux/icmp.h>

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index bff4322e144ab82ed1e651451c05029cf4007c5f..f2be6584422199cadbd347025deacfa20b759270 100644 (file)
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -32,7 +32,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/random.h>
 #include <linux/init.h>
 #include <linux/utsname.h>

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index fde4cf68498f83c9a0a5b66eee81179f7c1dd189..62815e2f65c04d3064ff955f6af39a56ef549154 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -28,7 +28,7 @@
 #include <linux/string.h>
 #include <linux/socket.h>
 #include <linux/sockios.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/net.h>
 #include <linux/in6.h>
 #include <linux/netdevice.h>

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index c8582f592a4fd1f9468d8e5a13f6d0edaab9d75b..4b510958db4c543a367840cc82f51e871c086ce1 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -29,7 +29,7 @@
 #include <linux/string.h>
 #include <linux/socket.h>
 #include <linux/sockios.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/in6.h>

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 27a49a6260ce22aa548ef999bb3b1db493ac8463..2ad1b597364b40c2ffdf1190759441331dfc644a 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -29,7 +29,7 @@
 #include <linux/socket.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <linux/netdevice.h>

diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index 5142e74ae9aa55d9feb80d1fb4814995d36f9d46..f932afcea4b8bd589730730908b47d8852b8f792 100644 (file)
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -21,7 +21,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c
index d65e32e5e1cb22569c00362fe3f22f0dda535edc..a010ac9d63fc334a2161c95acb0047282f2d15b2 100644 (file)
--- a/net/lapb/lapb_timer.c
+++ b/net/lapb/lapb_timer.c
@@ -19,7 +19,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index ba9c70e5042aa5e3f57eeb2393ffa6d09344472c..cdeab2e21f551c333a54f86409e07c73d536ecbd 100644 (file)
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -20,7 +20,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c
index 1cd86a1d6948b82902a0b26ed9a7a78fadf8fda7..3935526edc3a5cb948bf004a6bb3605585615ac0 100644 (file)
--- a/net/rose/rose_link.c
+++ b/net/rose/rose_link.c
@@ -19,7 +19,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 3de5e475b31c3fbc3995a615b36220542a2ea3e7..4f66adbaf8a73ef35638d114d3c94516479f2177 100644 (file)
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -20,7 +20,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/sched/estimator.c b/net/sched/estimator.c
index e70066f9c1bbf31f722c1cdfd0a8b2e2d4431dc2..15781929dbb45fedbe6b4d39a569395e988c4ecb 100644 (file)
--- a/net/sched/estimator.c
+++ b/net/sched/estimator.c
@@ -14,7 +14,7 @@
 #include <asm/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>

diff --git a/net/sched/sch_csz.c b/net/sched/sch_csz.c
index 6f68572373b720fc305e88738f02ef2c247380d9..b90ce1838d354af0b8917c014f0f13f5bb6a9aca 100644 (file)
--- a/net/sched/sch_csz.c
+++ b/net/sched/sch_csz.c
@@ -17,7 +17,7 @@
 #include <asm/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index c96762fbdcb925608cdd11759c994f3b03ed52bf..9c20875674a42d1bf7f5a197fa3e768e89bb2840 100644 (file)
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -16,7 +16,7 @@
 #include <asm/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>

diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 19a3de99aafe347e3d714a0bd8a74eb49bb4bae5..4012cf0b62158eac991c3983a66e6031b97762d2 100644 (file)
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -17,7 +17,7 @@
 #include <asm/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>

diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index cce5b6a3afaae57e84afd0086fd2990f8fc96861..35056521ac3eef79db228a4fd7af2c846968216c 100644 (file)
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -25,7 +25,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 5568d19b1349733d3b8e8dc3fc8637cabbd56aab..47e1c5823496c2fc71e95168b527a435eaa86af8 100644 (file)
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -23,7 +23,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index d749dfa0a0ca3dbb8b24603e6bee4f33c637a2c2..7e43380a52b78d6c70acb86731dff8c64d75d7a7 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -20,7 +20,7 @@
 
 #include <sound/driver.h>
 #include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/wait.h>

diff --git a/sound/oss/emu10k1/cardmi.c b/sound/oss/emu10k1/cardmi.c
index 5bc18eb1627fc931043fff9ad1386402e934c6c6..a6140b00f884ed0e5fa05f48571c4329c637019a 100644 (file)
--- a/sound/oss/emu10k1/cardmi.c
+++ b/sound/oss/emu10k1/cardmi.c
@@ -31,7 +31,7 @@
  */
 
 #include <linux/slab.h>
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 
 #include "hwaccess.h"
 #include "8010.h"