includes cleanup.

PATCH New Dave Jones 4 participants 16 messages Aug 19, 2004 – Aug 26, 2004

Subsystems (61)

Networking Network drivers Memory management Arm (32-bit) +57 more subsystems

lore

Share & tools

lore

Dave Jones

author

2004-08-19 14:43 UTC #0 lore raw

I noticed that every file that could be built as a module was sucking in sched.h (and therefore, every other include file under the sun).

This patch
- removes the sched.h from module.h
- Moves the capable() definition from sched.h to capability.h
- split out the wake_up_* stuff to linux/wakeup.h
- Removed sched.h includes from a bunch of drivers that didn't
need it due to the above work.
- Fixes up all the breakage I was able to find under x86.
Fixing other arch's is simple enough, they just need to include sched.h explicity in a few places now (or jiffies.h, or capability.h or wakeup.h))

I've not done any measurements to see if this is noticable on a compile, as I'd expect it to be mostly in the noise anyway (though last time I did this in 2.5.early, it did shave off the best part of a minute off my worst-case-scenario build), but untangling the spaghetti of includes a little should at least mean gcc uses less memory during the build.

comments?

Dave

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet

#   2004/08/14 22:17:56+01:00 [email protected] 
#   [INCLUDE] Remove sched.h inclusion from module.h.
#   Also move some capability bits to capability.h, and break
#   out some of sched.h to wakeup.h

#
# Build checked for make all modconfig,yesconfig,noconfig
#
# Signed-off-by: Dave Jones <[email protected]>
#

arch/i386/kernel/cpu/cpufreq/p4-clockmod.c +1 -0

diff -Nru a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
@@ -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>

arch/i386/kernel/cpu/cpufreq/powernow-k8.c +1 -0

diff -Nru a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -27,6 +27,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/sched.h>	/* for current / set_cpus_allowed() */
 
 #include <asm/msr.h>
 #include <asm/io.h>

arch/i386/kernel/cpu/mtrr/if.c +1 -0

diff -Nru a/arch/i386/kernel/cpu/mtrr/if.c b/arch/i386/kernel/cpu/mtrr/if.c
@@ -3,6 +3,7 @@
 #include <linux/ctype.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 
 #define LINE_SIZE 80

drivers/block/paride/paride.c +1 -0

diff -Nru a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
@@ -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

drivers/block/paride/pg.c +2 -0

diff -Nru a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
@@ -162,6 +162,8 @@
 #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>

drivers/block/paride/pt.c +1 -0

diff -Nru a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
@@ -146,6 +146,7 @@
 #include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/device.h>
+#include <linux/sched.h>	/* current, TASK_*, schedule_timeout() */
 
 #include <asm/uaccess.h>

drivers/char/i8k.c +1 -0

diff -Nru a/drivers/char/i8k.c b/drivers/char/i8k.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/apm_bios.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>

drivers/char/watchdog/cpu5wdt.c +1 -0

diff -Nru a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
@@ -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>

drivers/char/watchdog/mixcomwd.c +2 -0

diff -Nru a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
@@ -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>

drivers/char/watchdog/pcwd.c +1 -1

diff -Nru a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
@@ -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>

drivers/char/watchdog/sc520_wdt.c +1 -0

diff -Nru a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
@@ -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>

drivers/char/watchdog/softdog.c +2 -0

diff -Nru a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
@@ -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: "

drivers/input/joystick/a3d.c +1 -0

diff -Nru a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("FP-Gaming Assasin 3D joystick driver");

drivers/input/joystick/adi.c +1 -0

diff -Nru a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
@@ -36,6 +36,7 @@
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Logitech ADI joystick family driver");

drivers/input/joystick/analog.c +1 -0

diff -Nru a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 #include <asm/timex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");

drivers/input/joystick/cobra.c +1 -0

diff -Nru a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Creative Labs Blaster GamePad Cobra driver");

drivers/input/joystick/gf2k.c +1 -0

diff -Nru a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Genius Flight 2000 joystick driver");

drivers/input/joystick/grip.c +1 -0

diff -Nru a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Gravis GrIP protocol joystick driver");

drivers/input/joystick/grip_mp.c +1 -0

diff -Nru a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
@@ -19,6 +19,7 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Brian Bonnlander");
 MODULE_DESCRIPTION("Gravis Grip Multiport driver");

drivers/input/joystick/guillemot.c +1 -0

diff -Nru a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Guillemot Digital joystick driver");

drivers/input/joystick/interact.c +1 -0

diff -Nru a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("InterAct digital joystick driver");

drivers/input/joystick/sidewinder.c +1 -0

diff -Nru a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Microsoft SideWinder joystick family driver");

drivers/input/joystick/tmdc.c +1 -0

diff -Nru a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("ThrustMaster DirectConnect joystick driver");

drivers/isdn/capi/capifs.c +1 -0

diff -Nru a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
@@ -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");

drivers/media/radio/miropcm20-rds.c +1 -0

diff -Nru a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
@@ -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 <asm/uaccess.h>
 #include "miropcm20-rds-core.h"

drivers/mtd/mtdblock.c +1 -0

diff -Nru a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
@@ -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>

drivers/mtd/mtdchar.c +1 -0

diff -Nru a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
@@ -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>
 
 #ifdef CONFIG_DEVFS_FS

drivers/mtd/mtdconcat.c +1 -1

diff -Nru a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
@@ -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>

drivers/w1/w1_family.c +1 -0

diff -Nru a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
@@ -21,6 +21,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>	/* schedule_timeout() */
 
 #include "w1_family.h"

fs/filesystems.c +1 -0

diff -Nru a/fs/filesystems.c b/fs/filesystems.c
@@ -11,6 +11,7 @@
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/sched.h>	/* for 'current' */
 #include <asm/uaccess.h>
 
 /*

fs/jffs2/wbuf.c +2 -0

diff -Nru a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
@@ -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 */

include/linux/capability.h +15 -0

diff -Nru a/include/linux/capability.h b/include/linux/capability.h
@@ -353,6 +353,21 @@
 
 #define cap_is_fs_cap(c)     (CAP_TO_MASK(c) & CAP_FS_MASK)
 
+#ifdef CONFIG_SECURITY
+/* code is in security.c */
+extern int capable(int cap);
+#else
+static inline int capable(int cap)
+{
+	if (cap_raised(current->cap_effective, cap)) {
+		current->flags |= PF_SUPERPRIV;
+		return 1;
+	}
+	return 0;
+}
+#endif
+
 #endif /* __KERNEL__ */
 
 #endif /* !_LINUX_CAPABILITY_H */
+

include/linux/i2c.h +1 -0

diff -Nru a/include/linux/i2c.h b/include/linux/i2c.h
@@ -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>
 
 /* --- General options ------------------------------------------------	*/

include/linux/module.h +2 -2

diff -Nru a/include/linux/module.h b/include/linux/module.h
@@ -7,7 +7,6 @@
  * Rewritten again by Rusty Russell, 2002
  */
 #include <linux/config.h>
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/stat.h>

@@ -18,8 +17,9 @@
 #include <linux/stringify.h>
 #include <linux/kobject.h>
 #include <linux/moduleparam.h>
-#include <asm/local.h>
+#include <linux/wakeup.h>
 
+#include <asm/local.h>
 #include <asm/module.h>
 
 /* Not Yet Implemented */

include/linux/sched.h +2 ~~-28~~

diff -Nru a/include/linux/sched.h b/include/linux/sched.h
@@ -747,19 +747,8 @@
 extern unsigned long itimer_next;
 extern void do_timer(struct pt_regs *);
 
-extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
-extern int FASTCALL(wake_up_process(struct task_struct * tsk));
-extern void FASTCALL(wake_up_forked_process(struct task_struct * tsk));
-#ifdef CONFIG_SMP
- extern void kick_process(struct task_struct *tsk);
- extern void FASTCALL(wake_up_forked_thread(struct task_struct * tsk));
-#else
- static inline void kick_process(struct task_struct *tsk) { }
- static inline void wake_up_forked_thread(struct task_struct * tsk)
- {
-	wake_up_forked_process(tsk);
- }
-#endif
+#include <linux/wakeup.h>
+
 extern void FASTCALL(sched_fork(task_t * p));
 extern void FASTCALL(sched_exit(task_t * p));

@@ -827,21 +816,6 @@
 	return (current->sas_ss_size == 0 ? SS_DISABLE
 		: on_sig_stack(sp) ? SS_ONSTACK : 0);
 }
-
-
-#ifdef CONFIG_SECURITY
-/* code is in security.c */
-extern int capable(int cap);
-#else
-static inline int capable(int cap)
-{
-	if (cap_raised(current->cap_effective, cap)) {
-		current->flags |= PF_SUPERPRIV;
-		return 1;
-	}
-	return 0;
-}
-#endif
 
 /*
  * Routines for handling mm_structs

include/linux/wakeup.h new file +17 -0

diff -Nru a/include/linux/wakeup.h b/include/linux/wakeup.h
@@ -0,0 +1,17 @@
+#ifndef _LINUX_WAKEUP_H
+#define _LINUX_WAKEUP_H
+
+extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
+extern int FASTCALL(wake_up_process(struct task_struct * tsk));
+extern void FASTCALL(wake_up_forked_process(struct task_struct * tsk));
+#ifdef CONFIG_SMP
+ extern void kick_process(struct task_struct *tsk);
+ extern void FASTCALL(wake_up_forked_thread(struct task_struct * tsk));
+#else
+ static inline void kick_process(struct task_struct *tsk) { }
+ static inline void wake_up_forked_thread(struct task_struct * tsk)
+ {
+	wake_up_forked_process(tsk);
+ }
+#endif
+#endif

kernel/kallsyms.c +1 -0

diff -Nru a/kernel/kallsyms.c b/kernel/kallsyms.c
@@ -13,6 +13,7 @@
 #include <linux/fs.h>
 #include <linux/err.h>
 #include <linux/proc_fs.h>
+#include <linux/sched.h>	/* for cond_resched */
 
 /* These will be re-linked against their real values during the second link stage */
 extern unsigned long kallsyms_addresses[] __attribute__((weak));

sound/oss/ac97_codec.c +1 -0

diff -Nru a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c
@@ -54,6 +54,7 @@
 #include <linux/delay.h>
 #include <linux/ac97_codec.h>
 #include <asm/uaccess.h>
+#include <asm/semaphore.h>
 
 #define CODEC_ID_BUFSZ 14

Christoph Hellwig

2004-08-19 14:54 UTC #1 lore raw

Quoted 1 line · Dave Jones

- split out the wake_up_* stuff to linux/wakeup.h

linux/wait.h sounds like a better choice because the other half of the waitqueue operations are over there..

Dave Jones

author

2004-08-19 15:01 UTC #2 lore raw

Quoted 5 lines · Christoph Hellwig

Quoted 1 line · Dave Jones
- split out the wake_up_* stuff to linux/wakeup.h
linux/wait.h sounds like a better choice because the other half of the waitqueue operations are over there..

Sounds good to me. I'll make it happen.

Dave

Dave Jones

author

2004-08-19 16:54 UTC #3 lore raw

In reply to Christoph Hellwig

Quoted 5 lines · Christoph Hellwig

Quoted 1 line · Dave Jones
- split out the wake_up_* stuff to linux/wakeup.h
linux/wait.h sounds like a better choice because the other half of the waitqueue operations are over there..

here's the fixed up version. Still x86 only.

Dave

arch/i386/kernel/cpu/cpufreq/p4-clockmod.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c sched/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
@@ -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>

arch/i386/kernel/cpu/cpufreq/powernow-k8.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/cpu/cpufreq/powernow-k8.c sched/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -27,6 +27,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/sched.h>	/* for current / set_cpus_allowed() */
 
 #include <asm/msr.h>
 #include <asm/io.h>

arch/i386/kernel/cpu/mtrr/if.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/cpu/mtrr/if.c sched/arch/i386/kernel/cpu/mtrr/if.c
@@ -3,6 +3,7 @@
 #include <linux/ctype.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 
 #define LINE_SIZE 80

drivers/block/paride/paride.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/block/paride/paride.c sched/drivers/block/paride/paride.c
@@ -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

drivers/block/paride/pg.c +2 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/block/paride/pg.c sched/drivers/block/paride/pg.c
@@ -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>

drivers/block/paride/pt.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/block/paride/pt.c sched/drivers/block/paride/pt.c
@@ -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>

drivers/char/i8k.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/i8k.c sched/drivers/char/i8k.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/apm_bios.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>

drivers/char/watchdog/cpu5wdt.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/cpu5wdt.c sched/drivers/char/watchdog/cpu5wdt.c
@@ -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>

drivers/char/watchdog/mixcomwd.c +2 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/mixcomwd.c sched/drivers/char/watchdog/mixcomwd.c
@@ -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>

drivers/char/watchdog/pcwd.c +1 -1

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/pcwd.c sched/drivers/char/watchdog/pcwd.c
@@ -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>

drivers/char/watchdog/sc520_wdt.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/sc520_wdt.c sched/drivers/char/watchdog/sc520_wdt.c
@@ -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>

drivers/char/watchdog/softdog.c +2 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/softdog.c sched/drivers/char/watchdog/softdog.c
@@ -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: "

drivers/input/joystick/a3d.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/a3d.c sched/drivers/input/joystick/a3d.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("FP-Gaming Assasin 3D joystick driver");

drivers/input/joystick/adi.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/adi.c sched/drivers/input/joystick/adi.c
@@ -36,6 +36,7 @@
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Logitech ADI joystick family driver");

drivers/input/joystick/analog.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/analog.c sched/drivers/input/joystick/analog.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 #include <asm/timex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");

drivers/input/joystick/cobra.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/cobra.c sched/drivers/input/joystick/cobra.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Creative Labs Blaster GamePad Cobra driver");

drivers/input/joystick/gf2k.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/gf2k.c sched/drivers/input/joystick/gf2k.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Genius Flight 2000 joystick driver");

drivers/input/joystick/grip.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/grip.c sched/drivers/input/joystick/grip.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Gravis GrIP protocol joystick driver");

drivers/input/joystick/grip_mp.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/grip_mp.c sched/drivers/input/joystick/grip_mp.c
@@ -19,6 +19,7 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Brian Bonnlander");
 MODULE_DESCRIPTION("Gravis Grip Multiport driver");

drivers/input/joystick/guillemot.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/guillemot.c sched/drivers/input/joystick/guillemot.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Guillemot Digital joystick driver");

drivers/input/joystick/interact.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/interact.c sched/drivers/input/joystick/interact.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("InterAct digital joystick driver");

drivers/input/joystick/sidewinder.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/sidewinder.c sched/drivers/input/joystick/sidewinder.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Microsoft SideWinder joystick family driver");

drivers/input/joystick/tmdc.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/tmdc.c sched/drivers/input/joystick/tmdc.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("ThrustMaster DirectConnect joystick driver");

drivers/isdn/capi/capifs.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/isdn/capi/capifs.c sched/drivers/isdn/capi/capifs.c
@@ -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");

drivers/media/radio/miropcm20-rds.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/media/radio/miropcm20-rds.c sched/drivers/media/radio/miropcm20-rds.c
@@ -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 <asm/uaccess.h>
 #include "miropcm20-rds-core.h"

drivers/mtd/mtdblock.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/mtd/mtdblock.c sched/drivers/mtd/mtdblock.c
@@ -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>

drivers/mtd/mtdchar.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/mtd/mtdchar.c sched/drivers/mtd/mtdchar.c
@@ -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>
 
 #ifdef CONFIG_DEVFS_FS

drivers/mtd/mtdconcat.c +1 -1

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/mtd/mtdconcat.c sched/drivers/mtd/mtdconcat.c
@@ -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>

drivers/w1/w1_family.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/w1/w1_family.c sched/drivers/w1/w1_family.c
@@ -21,6 +21,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>	/* schedule_timeout() */
 
 #include "w1_family.h"

fs/filesystems.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/fs/filesystems.c sched/fs/filesystems.c
@@ -11,6 +11,7 @@
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/sched.h>	/* for 'current' */
 #include <asm/uaccess.h>
 
 /*

fs/jffs2/wbuf.c +2 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/fs/jffs2/wbuf.c sched/fs/jffs2/wbuf.c
@@ -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 */

include/linux/capability.h +15 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/capability.h sched/include/linux/capability.h
@@ -353,6 +353,21 @@ static inline kernel_cap_t cap_invert(ke
 
 #define cap_is_fs_cap(c)     (CAP_TO_MASK(c) & CAP_FS_MASK)
 
+#ifdef CONFIG_SECURITY
+/* code is in security.c */
+extern int capable(int cap);
+#else
+static inline int capable(int cap)
+{
+	if (cap_raised(current->cap_effective, cap)) {
+		current->flags |= PF_SUPERPRIV;
+		return 1;
+	}
+	return 0;
+}
+#endif
+
 #endif /* __KERNEL__ */
 
 #endif /* !_LINUX_CAPABILITY_H */
+

include/linux/i2c.h +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/i2c.h sched/include/linux/i2c.h
@@ -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>
 
 /* --- General options ------------------------------------------------	*/

include/linux/module.h +2 -2

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/module.h sched/include/linux/module.h
@@ -7,7 +7,6 @@
  * Rewritten again by Rusty Russell, 2002
  */
 #include <linux/config.h>
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/stat.h>

@@ -18,8 +17,9 @@
 #include <linux/stringify.h>
 #include <linux/kobject.h>
 #include <linux/moduleparam.h>
-#include <asm/local.h>
+#include <linux/wait.h>
 
+#include <asm/local.h>
 #include <asm/module.h>
 
 /* Not Yet Implemented */

include/linux/sched.h +2 ~~-28~~

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/sched.h sched/include/linux/sched.h
@@ -747,19 +747,8 @@ extern unsigned long itimer_ticks;
 extern unsigned long itimer_next;
 extern void do_timer(struct pt_regs *);
 
-extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
-extern int FASTCALL(wake_up_process(struct task_struct * tsk));
-extern void FASTCALL(wake_up_forked_process(struct task_struct * tsk));
-#ifdef CONFIG_SMP
- extern void kick_process(struct task_struct *tsk);
- extern void FASTCALL(wake_up_forked_thread(struct task_struct * tsk));
-#else
- static inline void kick_process(struct task_struct *tsk) { }
- static inline void wake_up_forked_thread(struct task_struct * tsk)
- {
-	wake_up_forked_process(tsk);
- }
-#endif
+#include <linux/wait.h>
+
 extern void FASTCALL(sched_fork(task_t * p));
 extern void FASTCALL(sched_exit(task_t * p));

@@ -828,21 +817,6 @@ static inline int sas_ss_flags(unsigned 
 		: on_sig_stack(sp) ? SS_ONSTACK : 0);
 }
 
-
-#ifdef CONFIG_SECURITY
-/* code is in security.c */
-extern int capable(int cap);
-#else
-static inline int capable(int cap)
-{
-	if (cap_raised(current->cap_effective, cap)) {
-		current->flags |= PF_SUPERPRIV;
-		return 1;
-	}
-	return 0;
-}
-#endif
-
 /*
  * Routines for handling mm_structs
  */

include/linux/wait.h +13 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/wait.h sched/include/linux/wait.h
@@ -107,6 +107,19 @@ static inline void __remove_wait_queue(w
 void FASTCALL(__wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key));
 extern void FASTCALL(__wake_up_locked(wait_queue_head_t *q, unsigned int mode));
 extern void FASTCALL(__wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr));
+extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
+extern int FASTCALL(wake_up_process(struct task_struct * tsk));
+extern void FASTCALL(wake_up_forked_process(struct task_struct * tsk));
+#ifdef CONFIG_SMP
+ extern void kick_process(struct task_struct *tsk);
+ extern void FASTCALL(wake_up_forked_thread(struct task_struct * tsk));
+#else
+ static inline void kick_process(struct task_struct *tsk) { }
+ static inline void wake_up_forked_thread(struct task_struct * tsk)
+ {
+	wake_up_forked_process(tsk);
+ }
+#endif
 
 #define wake_up(x)			__wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 1, NULL)
 #define wake_up_nr(x, nr)		__wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, nr, NULL)

kernel/kallsyms.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/kernel/kallsyms.c sched/kernel/kallsyms.c
@@ -13,6 +13,7 @@
 #include <linux/fs.h>
 #include <linux/err.h>
 #include <linux/proc_fs.h>
+#include <linux/sched.h>	/* for cond_resched */
 
 /* These will be re-linked against their real values during the second link stage */
 extern unsigned long kallsyms_addresses[] __attribute__((weak));

sound/oss/ac97_codec.c +1 -0

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/ac97_codec.c sched/sound/oss/ac97_codec.c
@@ -54,6 +54,7 @@
 #include <linux/delay.h>
 #include <linux/ac97_codec.h>
 #include <asm/uaccess.h>
+#include <asm/semaphore.h>
 
 #define CODEC_ID_BUFSZ 14

William Lee Irwin III

2004-08-19 15:12 UTC #4 lore raw

In reply to Dave Jones

Quoted 3 lines · Dave Jones

I noticed that every file that could be built as a module was sucking in sched.h (and therefore, every other include file under the sun). This patch

[... which bits got moved to more appropriate places...]

Quoted 6 lines

I've not done any measurements to see if this is noticable on a compile, as I'd expect it to be mostly in the noise anyway (though last time I did this in 2.5.early, it did shave off the best part of a minute off my worst-case-scenario build), but untangling the spaghetti of includes a little should at least mean gcc uses less memory during the build. comments?

sched.h is such an extreme garbage can header I wouldn't mind seeing the whole thing torn completely apart. Every little trimming is good. =)

-- wli

William Lee Irwin III

2004-08-25 18:03 UTC #5 lore raw

PATCH 1/2 convert linux/user.h users to asm/user.h

Quoted 4 lines · Dave Jones

Quoted 3 lines
I noticed that every file that could be built as a module was sucking in sched.h (and therefore, every other include file under the sun). This patch
[... which bits got moved to more appropriate places...]

Quoted 2 lines · William Lee Irwin III

sched.h is such an extreme garbage can header I wouldn't mind seeing the whole thing torn completely apart. Every little trimming is good. =)

I hereby declare open season on linux/sched.h!

In preparation for moving all user-related bits out of sched.h and coopting linux/user.h for this purpose, this patch converts all inclusions of linux/user.h to asm/user.h

The #error in linux/user.h is blown away by the successor to this patch, which fills it in with user-related bits split off from sched.h.

vs. 2.6.8.1-mm4

arch/alpha/kernel/alpha_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/alpha/kernel/alpha_ksyms.c
===================================================================
@@ -8,7 +8,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/socket.h>
 #include <linux/syscalls.h>

arch/alpha/kernel/osf_sys.c +1 -1

Index: mm4-2.6.8.1/arch/alpha/kernel/osf_sys.c
===================================================================
@@ -21,7 +21,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/utsname.h>
 #include <linux/time.h>

@@ -38,6 +37,7 @@
 #include <linux/uio.h>
 #include <linux/vfs.h>
 
+#include <asm/user.h>
 #include <asm/fpu.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>

arch/alpha/kernel/process.c +0 -1

Index: mm4-2.6.8.1/arch/alpha/kernel/process.c
===================================================================
@@ -20,7 +20,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/utsname.h>
 #include <linux/time.h>

arch/alpha/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/alpha/kernel/ptrace.c
===================================================================
@@ -11,10 +11,10 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/slab.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/alpha/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/alpha/kernel/setup.c
===================================================================
@@ -17,7 +17,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/delay.h>

@@ -39,6 +38,7 @@
 #include <linux/reboot.h>
 #endif
 #include <linux/notifier.h>
+#include <asm/user.h>
 #include <asm/setup.h>
 #include <asm/io.h>

arch/arm/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/arm/kernel/process.c
===================================================================
@@ -19,7 +19,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/delay.h>
 #include <linux/reboot.h>

@@ -27,6 +26,7 @@
 #include <linux/kallsyms.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/leds.h>

arch/arm/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/arm/kernel/ptrace.c
===================================================================
@@ -15,10 +15,10 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/arm26/kernel/armksyms.c +1 -1

Index: mm4-2.6.8.1/arch/arm26/kernel/armksyms.c
===================================================================
@@ -9,7 +9,6 @@
  */
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/user.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/mm.h>

@@ -23,6 +22,7 @@
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 
+#include <asm/user.h>
 #include <asm/byteorder.h>
 #include <asm/elf.h>
 #include <asm/io.h>

arch/arm26/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/arm26/kernel/process.c
===================================================================
@@ -20,13 +20,13 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/leds.h>

arch/arm26/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/arm26/kernel/ptrace.c
===================================================================
@@ -16,9 +16,9 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/cris/arch-v10/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/cris/arch-v10/kernel/ptrace.c
===================================================================
@@ -9,8 +9,8 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/cris/kernel/crisksyms.c +0 -1

Index: mm4-2.6.8.1/arch/cris/kernel/crisksyms.c
===================================================================
@@ -1,6 +1,5 @@
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/sched.h>
 #include <linux/in6.h>

arch/cris/kernel/process.c +0 -1

Index: mm4-2.6.8.1/arch/cris/kernel/process.c
===================================================================
@@ -110,7 +110,6 @@
 #include <linux/init_task.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/mqueue.h>

arch/cris/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/cris/kernel/ptrace.c
===================================================================
@@ -64,8 +64,8 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/h8300/kernel/h8300_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/h8300/kernel/h8300_ksyms.c
===================================================================
@@ -3,7 +3,6 @@
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/in6.h>
 #include <linux/interrupt.h>

arch/h8300/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/h8300/kernel/process.c
===================================================================
@@ -34,11 +34,11 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/traps.h>

arch/h8300/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/h8300/kernel/ptrace.c
===================================================================
@@ -22,9 +22,9 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/config.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/i386/kernel/i386_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/i386/kernel/i386_ksyms.c
===================================================================
@@ -1,7 +1,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/smp.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/mca.h>
 #include <linux/sched.h>

arch/i386/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/i386/kernel/process.c
===================================================================
@@ -25,7 +25,6 @@
 #include <linux/stddef.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>

@@ -39,6 +38,7 @@
 #include <linux/kallsyms.h>
 #include <linux/ptrace.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/i386/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/i386/kernel/ptrace.c
===================================================================
@@ -12,10 +12,10 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 #include <linux/audit.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/ia64/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/ia64/kernel/ptrace.c
===================================================================
@@ -15,9 +15,9 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/smp_lock.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/ptrace_offsets.h>

arch/m68k/kernel/m68k_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/m68k/kernel/m68k_ksyms.c
===================================================================
@@ -3,7 +3,6 @@
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/in6.h>
 #include <linux/interrupt.h>

arch/m68k/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/m68k/kernel/process.c
===================================================================
@@ -22,12 +22,12 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/reboot.h>
 #include <linux/init_task.h>
 #include <linux/mqueue.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/traps.h>

arch/m68k/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/m68k/kernel/ptrace.c
===================================================================
@@ -17,9 +17,9 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/config.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/m68k/kernel/traps.c +1 -1

Index: mm4-2.6.8.1/arch/m68k/kernel/traps.c
===================================================================
@@ -25,13 +25,13 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/a.out.h>
-#include <linux/user.h>
 #include <linux/string.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/ptrace.h>
 #include <linux/kallsyms.h>
 
+#include <asm/user.h>
 #include <asm/setup.h>
 #include <asm/fpu.h>
 #include <asm/system.h>

arch/m68knommu/kernel/m68k_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/m68knommu/kernel/m68k_ksyms.c
===================================================================
@@ -3,7 +3,6 @@
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/in6.h>
 #include <linux/interrupt.h>

arch/m68knommu/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/m68knommu/kernel/process.c
===================================================================
@@ -25,11 +25,11 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/traps.h>

arch/m68knommu/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/m68knommu/kernel/ptrace.c
===================================================================
@@ -17,9 +17,9 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/config.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/m68knommu/kernel/traps.c +1 -1

Index: mm4-2.6.8.1/arch/m68knommu/kernel/traps.c
===================================================================
@@ -23,12 +23,12 @@
 #include <linux/mm.h>
 #include <linux/types.h>
 #include <linux/a.out.h>
-#include <linux/user.h>
 #include <linux/string.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/ptrace.h>
 
+#include <asm/user.h>
 #include <asm/setup.h>
 #include <asm/fpu.h>
 #include <asm/system.h>

arch/mips/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/mips/kernel/process.c
===================================================================
@@ -19,11 +19,11 @@
 #include <linux/mman.h>
 #include <linux/personality.h>
 #include <linux/sys.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/init.h>
 #include <linux/completion.h>
 
+#include <asm/user.h>
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
 #include <asm/fpu.h>

arch/mips/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/mips/kernel/ptrace.c
===================================================================
@@ -23,9 +23,9 @@
 #include <linux/ptrace.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/cpu.h>
 #include <asm/fpu.h>
 #include <asm/mipsregs.h>

arch/mips/kernel/ptrace32.c +1 -1

Index: mm4-2.6.8.1/arch/mips/kernel/ptrace32.c
===================================================================
@@ -22,9 +22,9 @@
 #include <linux/ptrace.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/cpu.h>
 #include <asm/fpu.h>
 #include <asm/mipsregs.h>

arch/mips/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/mips/kernel/setup.c
===================================================================
@@ -22,7 +22,6 @@
 #include <linux/string.h>
 #include <linux/unistd.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/utsname.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>

@@ -34,6 +33,7 @@
 #include <linux/highmem.h>
 #include <linux/console.h>
 
+#include <asm/user.h>
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>

arch/parisc/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/parisc/kernel/ptrace.c
===================================================================
@@ -13,11 +13,11 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/personality.h>
 #include <linux/security.h>
 #include <linux/compat.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/ppc/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/kernel/process.c
===================================================================
@@ -28,7 +28,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/elf.h>
 #include <linux/init.h>
 #include <linux/prctl.h>

@@ -38,6 +37,7 @@
 #include <linux/perfctr.h>
 #include <linux/mqueue.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/ppc/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/kernel/ptrace.c
===================================================================
@@ -24,9 +24,9 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/ppc/kernel/softemu8xx.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/kernel/softemu8xx.c
===================================================================
@@ -22,10 +22,10 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/ppc/kernel/traps.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/kernel/traps.c
===================================================================
@@ -24,7 +24,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>

@@ -32,6 +31,7 @@
 #include <linux/module.h>
 #include <linux/prctl.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/ppc/platforms/chrp_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/platforms/chrp_setup.c
===================================================================
@@ -19,7 +19,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -38,6 +37,7 @@
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
 
+#include <asm/user.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>

arch/ppc/platforms/pmac_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/platforms/pmac_setup.c
===================================================================
@@ -33,7 +33,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/string.h>

@@ -52,6 +51,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
+#include <asm/user.h>
 #include <asm/reg.h>
 #include <asm/sections.h>
 #include <asm/prom.h>

arch/ppc/platforms/prep_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/platforms/prep_setup.c
===================================================================
@@ -24,7 +24,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -40,6 +39,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
+#include <asm/user.h>
 #include <asm/sections.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>

arch/ppc/platforms/residual.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/platforms/residual.c
===================================================================
@@ -29,7 +29,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -40,6 +39,7 @@
 #include <linux/pci.h>
 #include <linux/ide.h>
 
+#include <asm/user.h>
 #include <asm/sections.h>
 #include <asm/mmu.h>
 #include <asm/io.h>

arch/ppc/syslib/m8260_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/syslib/m8260_setup.c
===================================================================
@@ -21,7 +21,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -33,6 +32,7 @@
 #include <linux/ide.h>
 #include <linux/seq_file.h>
 
+#include <asm/user.h>
 #include <asm/mmu.h>
 #include <asm/residual.h>
 #include <asm/io.h>

arch/ppc/syslib/m8xx_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc/syslib/m8xx_setup.c
===================================================================
@@ -21,7 +21,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -34,6 +33,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
+#include <asm/user.h>
 #include <asm/mmu.h>
 #include <asm/reg.h>
 #include <asm/residual.h>

arch/ppc64/kernel/chrp_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc64/kernel/chrp_setup.c
===================================================================
@@ -24,7 +24,6 @@
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -43,6 +42,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
+#include <asm/user.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/io.h>

arch/ppc64/kernel/pmac_setup.c +1 -1

Index: mm4-2.6.8.1/arch/ppc64/kernel/pmac_setup.c
===================================================================
@@ -33,7 +33,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/string.h>

@@ -52,6 +51,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
+#include <asm/user.h>
 #include <asm/processor.h>
 #include <asm/sections.h>
 #include <asm/prom.h>

arch/ppc64/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/ppc64/kernel/process.c
===================================================================
@@ -27,7 +27,6 @@
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/elf.h>
 #include <linux/init.h>
 #include <linux/init_task.h>

@@ -36,6 +35,7 @@
 #include <linux/kallsyms.h>
 #include <linux/version.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/ppc64/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/ppc64/kernel/ptrace.c
===================================================================
@@ -24,10 +24,10 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 #include <linux/audit.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/ppc64/kernel/ptrace32.c +1 -1

Index: mm4-2.6.8.1/arch/ppc64/kernel/ptrace32.c
===================================================================
@@ -24,9 +24,9 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/ppc64/kernel/traps.c +1 -1

Index: mm4-2.6.8.1/arch/ppc64/kernel/traps.c
===================================================================
@@ -24,12 +24,12 @@
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/s390/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/s390/kernel/process.c
===================================================================
@@ -29,7 +29,6 @@
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>

@@ -38,6 +37,7 @@
 #include <linux/module.h>
 #include <linux/notifier.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/s390/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/s390/kernel/ptrace.c
===================================================================
@@ -29,9 +29,9 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/s390/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/s390/kernel/setup.c
===================================================================
@@ -23,7 +23,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/ioport.h>

@@ -37,6 +36,7 @@
 #include <linux/seq_file.h>
 #include <linux/kernel_stat.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/smp.h>

arch/sh/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/sh/kernel/ptrace.c
===================================================================
@@ -18,10 +18,10 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/slab.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>

arch/sh/kernel/sh_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/sh/kernel/sh_ksyms.c
===================================================================
@@ -1,7 +1,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/smp.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/sched.h>
 #include <linux/in6.h>

arch/sh64/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/sh64/kernel/process.c
===================================================================
@@ -44,7 +44,6 @@
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/unistd.h>

@@ -52,6 +51,7 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/sh64/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/sh64/kernel/ptrace.c
===================================================================
@@ -26,8 +26,8 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 
+#include <asm/user.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>

arch/sh64/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/sh64/kernel/setup.c
===================================================================
@@ -34,7 +34,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/ioport.h>

@@ -48,6 +47,7 @@
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/initrd.h>
+#include <asm/user.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>

arch/sh64/kernel/sh_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/sh64/kernel/sh_ksyms.c
===================================================================
@@ -13,7 +13,6 @@
 #include <linux/rwsem.h>
 #include <linux/module.h>
 #include <linux/smp.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/sched.h>
 #include <linux/in6.h>

arch/sparc/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/sparc/kernel/process.c
===================================================================
@@ -20,7 +20,6 @@
 #include <linux/stddef.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/config.h>
 #include <linux/smp.h>

@@ -30,6 +29,7 @@
 #include <linux/pm.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/auxio.h>
 #include <asm/oplib.h>
 #include <asm/uaccess.h>

arch/sparc/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/sparc/kernel/ptrace.c
===================================================================
@@ -14,11 +14,11 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>

arch/sparc/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/sparc/kernel/setup.c
===================================================================
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/initrd.h>
 #include <asm/smp.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/delay.h>

@@ -32,6 +31,7 @@
 #include <linux/spinlock.h>
 #include <linux/root_dev.h>
 
+#include <asm/user.h>
 #include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/io.h>

arch/sparc64/kernel/binfmt_aout32.c +1 -1

Index: mm4-2.6.8.1/arch/sparc64/kernel/binfmt_aout32.c
===================================================================
@@ -22,12 +22,12 @@
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/slab.h>
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>

arch/sparc64/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/sparc64/kernel/process.c
===================================================================
@@ -24,7 +24,6 @@
 #include <linux/stddef.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/config.h>
 #include <linux/reboot.h>

@@ -32,6 +31,7 @@
 #include <linux/compat.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/sparc64/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/sparc64/kernel/ptrace.c
===================================================================
@@ -15,11 +15,11 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/security.h>
 
+#include <asm/user.h>
 #include <asm/asi.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/sparc64/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/sparc64/kernel/setup.c
===================================================================
@@ -14,7 +14,6 @@
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <asm/smp.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/delay.h>

@@ -33,6 +32,7 @@
 #include <linux/cpu.h>
 #include <linux/initrd.h>
 
+#include <asm/user.h>
 #include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/io.h>

arch/v850/kernel/process.c +1 -1

Index: mm4-2.6.8.1/arch/v850/kernel/process.c
===================================================================
@@ -22,10 +22,10 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/reboot.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>

arch/v850/kernel/v850_ksyms.c +0 -1

Index: mm4-2.6.8.1/arch/v850/kernel/v850_ksyms.c
===================================================================
@@ -3,7 +3,6 @@
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/user.h>
 #include <linux/elfcore.h>
 #include <linux/in6.h>
 #include <linux/interrupt.h>

arch/x86_64/ia32/ia32_aout.c +1 -1

Index: mm4-2.6.8.1/arch/x86_64/ia32/ia32_aout.c
===================================================================
@@ -20,12 +20,12 @@
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/slab.h>
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>

arch/x86_64/ia32/tls32.c +1 -1

Index: mm4-2.6.8.1/arch/x86_64/ia32/tls32.c
===================================================================
@@ -1,8 +1,8 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
-#include <linux/user.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/desc.h>
 #include <asm/system.h>

arch/x86_64/kernel/process.c +0 -1

Index: mm4-2.6.8.1/arch/x86_64/kernel/process.c
===================================================================
@@ -25,7 +25,6 @@
 #include <linux/elfcore.h>
 #include <linux/smp.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/module.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>

arch/x86_64/kernel/ptrace.c +1 -1

Index: mm4-2.6.8.1/arch/x86_64/kernel/ptrace.c
===================================================================
@@ -14,10 +14,10 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/security.h>
 #include <linux/audit.h>
 
+#include <asm/user.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>

arch/x86_64/kernel/setup.c +1 -1

Index: mm4-2.6.8.1/arch/x86_64/kernel/setup.c
===================================================================
@@ -21,7 +21,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/ioport.h>

@@ -40,6 +39,7 @@
 #include <linux/acpi.h>
 #include <linux/kallsyms.h>
 #include <linux/edd.h>
+#include <asm/user.h>
 #include <asm/mtrr.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

arch/x86_64/kernel/x8664_ksyms.c +1 -1

Index: mm4-2.6.8.1/arch/x86_64/kernel/x8664_ksyms.c
===================================================================
@@ -1,7 +1,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/smp.h>
-#include <linux/user.h>
 #include <linux/sched.h>
 #include <linux/in6.h>
 #include <linux/interrupt.h>

@@ -15,6 +14,7 @@
 #include <linux/tty.h>
 #include <linux/ioctl32.h>
 
+#include <asm/user.h>
 #include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/i387.h>

drivers/ide/ppc/mpc8xx.c +1 -1

Index: mm4-2.6.8.1/drivers/ide/ppc/mpc8xx.c
===================================================================
@@ -20,7 +20,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/major.h>

@@ -31,6 +30,7 @@
 #include <linux/ide.h>
 #include <linux/bootmem.h>
 
+#include <asm/user.h>
 #include <asm/mpc8xx.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>

fs/binfmt_aout.c +1 -1

Index: mm4-2.6.8.1/fs/binfmt_aout.c
===================================================================
@@ -19,12 +19,12 @@
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/slab.h>
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
 
+#include <asm/user.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>

fs/binfmt_flat.c +1 -1

Index: mm4-2.6.8.1/fs/binfmt_flat.c
===================================================================
@@ -30,13 +30,13 @@
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/user.h>
 #include <linux/slab.h>
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
 #include <linux/flat.h>
 
+#include <asm/user.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>

fs/proc/kcore.c +0 -1

Index: mm4-2.6.8.1/fs/proc/kcore.c
===================================================================
@@ -12,7 +12,6 @@
 #include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
-#include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/elf.h>
 #include <linux/elfcore.h>

include/linux/elfcore.h +1 -1

Index: mm4-2.6.8.1/include/linux/elfcore.h
===================================================================
@@ -4,7 +4,7 @@
 #include <linux/types.h>
 #include <linux/signal.h>
 #include <linux/time.h>
-#include <linux/user.h>
+#include <asm/user.h>
 
 struct elf_siginfo
 {

include/linux/user.h +1 -1

Index: mm4-2.6.8.1/include/linux/user.h
===================================================================
@@ -1 +1 @@
-#include <asm/user.h>
+#error do not include this header

William Lee Irwin III

2004-08-25 18:04 UTC #6 lore raw

PATCH 2/2 move user-related stuff to linux/user.h

Quoted 7 lines · William Lee Irwin III

I hereby declare open season on linux/sched.h!
In preparation for moving all user-related bits out of sched.h and coopting linux/user.h for this purpose, this patch converts all inclusions of linux/user.h to asm/user.h
The #error in linux/user.h is blown away by the successor to this patch, which fills it in with user-related bits split off from sched.h. vs. 2.6.8.1-mm4

This patch moves all user bits from linux/sched.h to linux/user.h and sweeps all files fiddling with users.

include/linux/init_task.h +1 -0

Index: mm4-2.6.8.1/include/linux/init_task.h
===================================================================
@@ -2,6 +2,7 @@
 #define _LINUX__INIT_TASK_H
 
 #include <linux/file.h>
+#include <linux/user.h>
 #include <asm/resource.h>
 
 #define INIT_FILES \

include/linux/key.h +1 -0

Index: mm4-2.6.8.1/include/linux/key.h
===================================================================
@@ -59,6 +59,7 @@
 struct key_owner;
 struct keyring_list;
 struct keyring_name;
+struct user_struct;
 
 /*****************************************************************************/
 /*

include/linux/sched.h +1 ~~-36~~

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
@@ -334,32 +334,7 @@
 
 #define rt_task(p)		(unlikely((p)->prio < MAX_RT_PRIO))
 
-/*
- * Some day this will be a full-fledged user tracking system..
- */
-struct user_struct {
-	atomic_t __count;	/* reference count */
-	atomic_t processes;	/* How many processes does this user have? */
-	atomic_t files;		/* How many open files does this user have? */
-	atomic_t sigpending;	/* How many pending signals does this user have? */
-	/* protected by mq_lock	*/
-	unsigned long mq_bytes;	/* How many bytes can be allocated to mqueue? */
-	unsigned long locked_shm; /* How many pages of mlocked shm ? */
-
-#ifdef CONFIG_KEYS
-	struct key *uid_keyring;	/* UID specific keyring */
-	struct key *session_keyring;	/* UID's default session keyring */
-#endif
-
-	/* Hash table maintenance information */
-	struct list_head uidhash_list;
-	uid_t uid;
-};
-
-extern struct user_struct *find_user(uid_t);
-
-extern struct user_struct root_user;
-#define INIT_USER (&root_user)
+struct user_struct;
 
 typedef struct prio_array prio_array_t;
 struct backing_dev_info;

@@ -698,16 +673,6 @@
 extern void set_special_pids(pid_t session, pid_t pgrp);
 extern void __set_special_pids(pid_t session, pid_t pgrp);
 
-/* per-UID process charging. */
-extern struct user_struct * alloc_uid(uid_t);
-static inline struct user_struct *get_uid(struct user_struct *u)
-{
-	atomic_inc(&u->__count);
-	return u;
-}
-extern void free_uid(struct user_struct *);
-extern void switch_uid(struct user_struct *);
-
 #include <asm/current.h>
 
 extern unsigned long itimer_ticks;

include/linux/user.h +41 -1

42 lines not on this page · raw message

ipc/mqueue.c +1 -0

Index: mm4-2.6.8.1/ipc/mqueue.c
===================================================================
@@ -22,6 +22,7 @@
 #include <linux/msg.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
+#include <linux/user.h>
 #include <net/sock.h>
 #include "util.h"

kernel/exit.c +1 -0

Index: mm4-2.6.8.1/kernel/exit.c
===================================================================
@@ -27,6 +27,7 @@
 #include <linux/cpuset.h>
 #include <linux/perfctr.h>
 #include <linux/cpu.h>
+#include <linux/user.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

kernel/fork.c +1 -0

Index: mm4-2.6.8.1/kernel/fork.c
===================================================================
@@ -41,6 +41,7 @@
 #include <linux/profile.h>
 #include <linux/rmap.h>
 #include <linux/hash.h>
+#include <linux/user.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>

kernel/signal.c +1 -0

Index: mm4-2.6.8.1/kernel/signal.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/binfmts.h>
 #include <linux/security.h>
 #include <linux/ptrace.h>
+#include <linux/user.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

kernel/sys.c +1 -0

Index: mm4-2.6.8.1/kernel/sys.c
===================================================================
@@ -26,6 +26,7 @@
 #include <linux/dcookies.h>
 #include <linux/suspend.h>
 #include <linux/key.h>
+#include <linux/user.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>

kernel/user.c +1 -0

Index: mm4-2.6.8.1/kernel/user.c
===================================================================
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/key.h>
+#include <linux/user.h>
 
 /*
  * UID task count cache, to get fast user lookup in "alloc_uid"

mm/mlock.c +1 -1

Index: mm4-2.6.8.1/mm/mlock.c
===================================================================
@@ -7,7 +7,7 @@
 
 #include <linux/mman.h>
 #include <linux/mm.h>
-
+#include <linux/user.h>
 
 static int mlock_fixup(struct vm_area_struct * vma, 
 	unsigned long start, unsigned long end, unsigned int newflags)

security/keys/key.c +1 -0

Index: mm4-2.6.8.1/security/keys/key.c
===================================================================
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/err.h>
+#include <linux/user.h>
 #include "internal.h"
 
 static kmem_cache_t	*key_jar;

security/keys/process_keys.c +1 -0

Index: mm4-2.6.8.1/security/keys/process_keys.c
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/prctl.h>
 #include <linux/fs.h>
 #include <linux/err.h>
+#include <linux/user.h>
 #include <asm/uaccess.h>
 #include "internal.h"

William Lee Irwin III

2004-08-25 19:39 UTC #7 lore raw

cover remove signal.h from sched.h

Quoted 2 lines · William Lee Irwin III

This patch moves all user bits from linux/sched.h to linux/user.h and sweeps all files fiddling with users.

This series removes the dependency of sched.h on signal.h Atop the just-posted user bits atop 2.6.8.1-mm4.

-- wli

William Lee Irwin III

2004-08-25 19:41 UTC #8 lore raw

PATCH 1/4 move sighand_struct to signal.h

Quoted 2 lines · William Lee Irwin III

Quoted 2 lines
This patch moves all user bits from linux/sched.h to linux/user.h and sweeps all files fiddling with users.

Quoted 2 lines · William Lee Irwin III

This series removes the dependency of sched.h on signal.h Atop the just-posted user bits atop 2.6.8.1-mm4.

Move sighand_struct -related bits over to include/linux/signal.h

arch/ia64/kernel/asm-offsets.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/kernel/asm-offsets.c
===================================================================
@@ -7,6 +7,7 @@
 #include <linux/config.h>
 
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include <asm-ia64/processor.h>
 #include <asm-ia64/ptrace.h>

arch/mips/kernel/irixsig.c +1 -0

Index: mm4-2.6.8.1/arch/mips/kernel/irixsig.c
===================================================================
@@ -7,6 +7,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/smp.h>

arch/sparc64/solaris/signal.c +1 -0

Index: mm4-2.6.8.1/arch/sparc64/solaris/signal.c
===================================================================
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/svr4.h>

arch/um/kernel/signal_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/kernel/signal_kern.c
===================================================================
@@ -15,6 +15,7 @@
 #include "linux/tty.h"
 #include "linux/binfmts.h"
 #include "linux/ptrace.h"
+#include "linux/sighand.h"
 #include "asm/signal.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"

drivers/block/nbd.c +1 -0

Index: mm4-2.6.8.1/drivers/block/nbd.c
===================================================================
@@ -54,6 +54,7 @@
 #include <linux/errno.h>
 #include <linux/file.h>
 #include <linux/ioctl.h>
+#include <linux/signal.h>
 #include <net/sock.h>
 
 #include <linux/devfs_fs_kernel.h>

drivers/char/ftape/lowlevel/fdc-io.c +1 -0

Index: mm4-2.6.8.1/drivers/char/ftape/lowlevel/fdc-io.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/signal.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>

drivers/media/video/saa5249.c +1 -0

Index: mm4-2.6.8.1/drivers/media/video/saa5249.c
===================================================================
@@ -53,6 +53,7 @@
 #include <linux/i2c.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

drivers/mmc/mmc_queue.c +1 -0

Index: mm4-2.6.8.1/drivers/mmc/mmc_queue.c
===================================================================
@@ -10,6 +10,7 @@
  */
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/signal.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>

drivers/mtd/mtd_blkdevs.c +1 -0

Index: mm4-2.6.8.1/drivers/mtd/mtd_blkdevs.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/hdreg.h>
 #include <linux/init.h>
+#include <linux/sighand.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 #include <linux/devfs_fs_kernel.h>

fs/afs/internal.h +1 -0

Index: mm4-2.6.8.1/fs/afs/internal.h
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/signal.h>
 
 /*
  * debug tracing

fs/exec.c +1 -0

Index: mm4-2.6.8.1/fs/exec.c
===================================================================
@@ -47,6 +47,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>

fs/jffs/intrep.c +1 -0

Index: mm4-2.6.8.1/fs/jffs/intrep.c
===================================================================
@@ -67,6 +67,7 @@
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
+#include <linux/signal.h>
 
 #include "intrep.h"
 #include "jffs_fm.h"

fs/jffs2/background.c +1 -0

Index: mm4-2.6.8.1/fs/jffs2/background.c
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 #include "nodelist.h"

fs/lockd/clntproc.c +1 -0

Index: mm4-2.6.8.1/fs/lockd/clntproc.c
===================================================================
@@ -13,6 +13,7 @@
 #include <linux/nfs_fs.h>
 #include <linux/utsname.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>

fs/lockd/svc.c +1 -0

Index: mm4-2.6.8.1/fs/lockd/svc.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/stats.h>

fs/proc/task_nommu.c +1 -0

Index: mm4-2.6.8.1/fs/proc/task_nommu.c
===================================================================
@@ -2,6 +2,7 @@
 #include <linux/mm.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
+#include <linux/signal.h>
 
 /*
  * Logic: we've got two memory sums for each process, "shared", and

fs/reiser4/entd.c +1 -0

Index: mm4-2.6.8.1/fs/reiser4/entd.c
===================================================================
@@ -20,6 +20,7 @@
 #include <linux/writeback.h>
 #include <linux/time.h>         /* INITIAL_JIFFIES */
 #include <linux/backing-dev.h>  /* bdi_write_congested */
+#include <linux/signal.h>
 
 TYPE_SAFE_LIST_DEFINE(wbq, struct wbq, link);

fs/reiser4/ktxnmgrd.c +1 -0

Index: mm4-2.6.8.1/fs/reiser4/ktxnmgrd.c
===================================================================
@@ -34,6 +34,7 @@
 #include <linux/suspend.h>
 #include <linux/kernel.h>
 #include <linux/writeback.h>
+#include <linux/signal.h>
 
 static int scan_mgr(txn_mgr * mgr);

fs/reiser4/repacker.c +1 -0

Index: mm4-2.6.8.1/fs/reiser4/repacker.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/writeback.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <asm/atomic.h>

include/linux/init_task.h +1 -0

Index: mm4-2.6.8.1/include/linux/init_task.h
===================================================================
@@ -3,6 +3,7 @@
 
 #include <linux/file.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 #include <asm/resource.h>
 
 #define INIT_FILES \

include/linux/sched.h +3 ~~-18~~

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
@@ -20,10 +20,11 @@
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include <asm/mmu.h>
+#include <asm/signal.h>
+#include <asm/siginfo.h>
 
 #include <linux/smp.h>
 #include <linux/sem.h>
-#include <linux/signal.h>
 #include <linux/securebits.h>
 #include <linux/fs_struct.h>
 #include <linux/compiler.h>

@@ -253,11 +254,7 @@
 
 extern int mmlist_nr;
 
-struct sighand_struct {
-	atomic_t		count;
-	struct k_sigaction	action[_NSIG];
-	spinlock_t		siglock;
-};
+struct sighand_struct;
 
 struct sigpending {
 	struct list_head list;

@@ -704,18 +701,6 @@
 extern void flush_signal_handlers(struct task_struct *, int force_default);
 extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info);
 
-static inline int dequeue_signal_lock(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
-{
-	unsigned long flags;
-	int ret;
-
-	spin_lock_irqsave(&tsk->sighand->siglock, flags);
-	ret = dequeue_signal(tsk, mask, info);
-	spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
-
-	return ret;
-}	
-
 extern void block_all_signals(int (*notifier)(void *priv), void *priv,
 			      sigset_t *mask);
 extern void unblock_all_signals(void);

include/linux/signal.h +18 -0

Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
@@ -3,6 +3,7 @@
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <linux/sched.h>
 #include <asm/signal.h>
 #include <asm/siginfo.h>

@@ -22,6 +23,12 @@
 	struct user_struct *user;
 };
 
+struct sighand_struct {
+	atomic_t		count;
+	struct k_sigaction	action[_NSIG];
+	spinlock_t		siglock;
+};
+
 /* flags values. */
 #define SIGQUEUE_PREALLOC	1

@@ -206,6 +213,17 @@
 	INIT_LIST_HEAD(&sig->list);
 }
 
+static inline int dequeue_signal_lock(task_t *task, sigset_t *mask, siginfo_t *info)
+{
+	unsigned long flags;
+	int ret;
+
+	spin_lock_irqsave(&task->sighand->siglock, flags);
+	ret = dequeue_signal(task, mask, info);
+	spin_unlock_irqrestore(&task->sighand->siglock, flags);
+	return ret;
+}
+
 extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 extern long do_sigpending(void __user *, unsigned long);
 extern int sigprocmask(int, sigset_t *, sigset_t *);

kernel/exit.c +1 -0

Index: mm4-2.6.8.1/kernel/exit.c
===================================================================
@@ -28,6 +28,7 @@
 #include <linux/perfctr.h>
 #include <linux/cpu.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

kernel/kmod.c +1 -0

Index: mm4-2.6.8.1/kernel/kmod.c
===================================================================
@@ -36,6 +36,7 @@
 #include <linux/mount.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 
 extern int max_threads;

kernel/kthread.c +1 -0

Index: mm4-2.6.8.1/kernel/kthread.c
===================================================================
@@ -6,6 +6,7 @@
  * etc.).
  */
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kthread.h>
 #include <linux/completion.h>
 #include <linux/err.h>

kernel/power/process.c +1 -0

Index: mm4-2.6.8.1/kernel/power/process.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 /* 
  * Timeout for stopping processes

kernel/sys.c +1 -0

Index: mm4-2.6.8.1/kernel/sys.c
===================================================================
@@ -27,6 +27,7 @@
 #include <linux/suspend.h>
 #include <linux/key.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>

net/ipv4/ipvs/ip_vs_sync.c +1 -0

Index: mm4-2.6.8.1/net/ipv4/ipvs/ip_vs_sync.c
===================================================================
@@ -22,6 +22,7 @@
 #include <linux/slab.h>
 #include <linux/net.h>
 #include <linux/completion.h>
+#include <linux/signal.h>
 
 #include <linux/skbuff.h>
 #include <linux/in.h>

net/rxrpc/internal.h +1 -0

Index: mm4-2.6.8.1/net/rxrpc/internal.h
===================================================================
@@ -8,6 +8,7 @@
 
 #include <linux/compiler.h>
 #include <linux/kernel.h>
+#include <linux/signal.h>
 
 /*
  * debug accounting

net/sunrpc/clnt.c +1 -0

Index: mm4-2.6.8.1/net/sunrpc/clnt.c
===================================================================
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/in.h>
 #include <linux/utsname.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/clnt.h>
 #include <linux/workqueue.h>

net/sunrpc/sched.c +1 -0

Index: mm4-2.6.8.1/net/sunrpc/sched.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/xprt.h>

net/sunrpc/svc.c +1 -0

Index: mm4-2.6.8.1/net/sunrpc/svc.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/net.h>
 #include <linux/in.h>
 #include <linux/mm.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/xdr.h>

security/selinux/hooks.c +1 -0

Index: mm4-2.6.8.1/security/selinux/hooks.c
===================================================================
@@ -64,6 +64,7 @@
 #include <net/ipv6.h>
 #include <linux/hugetlb.h>
 #include <linux/personality.h>
+#include <linux/signal.h>
 
 #include "avc.h"
 #include "objsec.h"

William Lee Irwin III

2004-08-25 19:42 UTC #9 lore raw

PATCH 1/4 move sigqueue to signal.h

In reply to William Lee Irwin III

Quoted 2 lines · William Lee Irwin III

This series removes the dependency of sched.h on signal.h Atop the just-posted user bits atop 2.6.8.1-mm4.

Sorry, this is the real 1/4.

Move sigqueue-related bits to include/linux/signal.h

include/linux/sched.h +0 -4

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
@@ -730,10 +730,6 @@
 extern int kill_pg(pid_t, int, int);
 extern int kill_sl(pid_t, int, int);
 extern int kill_proc(pid_t, int, int);
-extern struct sigqueue *sigqueue_alloc(void);
-extern void sigqueue_free(struct sigqueue *);
-extern int send_sigqueue(int, struct sigqueue *,  struct task_struct *);
-extern int send_group_sigqueue(int, struct sigqueue *,  struct task_struct *);
 extern int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *);
 extern int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long);

include/linux/signal.h +4 -0

Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
@@ -214,6 +214,10 @@
 extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 extern long do_sigpending(void __user *, unsigned long);
 extern int sigprocmask(int, sigset_t *, sigset_t *);
+struct sigqueue *sigqueue_alloc(void);
+void sigqueue_free(struct sigqueue *);
+int send_sigqueue(int, struct sigqueue *, struct task_struct *);
+int send_group_sigqueue(int, struct sigqueue *, struct task_struct *);
 
 #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
 struct pt_regs;

kernel/posix-timers.c +1 -0

Index: mm4-2.6.8.1/kernel/posix-timers.c
===================================================================
@@ -45,6 +45,7 @@
 #include <linux/posix-timers.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <linux/signal.h>
 
 #ifndef div_long_long_rem
 #include <asm/div64.h>

kernel/signal.c +1 -0

Index: mm4-2.6.8.1/kernel/signal.c
===================================================================
@@ -22,6 +22,7 @@
 #include <linux/security.h>
 #include <linux/ptrace.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

William Lee Irwin III

2004-08-25 19:47 UTC #10 lore raw

PATCH 2/4 move sigpending to sched.h

Quoted 2 lines · William Lee Irwin III

Quoted 2 lines
This series removes the dependency of sched.h on signal.h Atop the just-posted user bits atop 2.6.8.1-mm4.

Quoted 2 lines · William Lee Irwin III

Sorry, this is the real 1/4.
Move sigqueue-related bits to include/linux/signal.h

Move sigpending -related bits to include/linux/sched.h

include/linux/sched.h +5 -0

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
@@ -259,6 +259,11 @@
 	spinlock_t		siglock;
 };
 
+struct sigpending {
+	struct list_head list;
+	sigset_t signal;
+};
+
 /*
  * NOTE! "signal_struct" does not have it's own
  * locking, because a shared signal_struct always

include/linux/signal.h +0 -5

Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
@@ -25,11 +25,6 @@
 /* flags values. */
 #define SIGQUEUE_PREALLOC	1
 
-struct sigpending {
-	struct list_head list;
-	sigset_t signal;
-};
-
 /*
  * Define some primitives to manipulate sigset_t.
  */

William Lee Irwin III

2004-08-25 19:47 UTC #11 lore raw

PATCH 3/4 move sighand to signal.h

Quoted 2 lines · William Lee Irwin III

Quoted 2 lines
Sorry, this is the real 1/4.
Move sigqueue-related bits to include/linux/signal.h

Quoted 1 line · William Lee Irwin III

Move sigpending -related bits to include/linux/sched.h

Move sighand_struct -related bits over to include/linux/signal.h

arch/ia64/kernel/asm-offsets.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/kernel/asm-offsets.c
===================================================================
@@ -7,6 +7,7 @@
 #include <linux/config.h>
 
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include <asm-ia64/processor.h>
 #include <asm-ia64/ptrace.h>

arch/mips/kernel/irixsig.c +1 -0

Index: mm4-2.6.8.1/arch/mips/kernel/irixsig.c
===================================================================
@@ -7,6 +7,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/smp.h>

arch/sparc64/solaris/signal.c +1 -0

Index: mm4-2.6.8.1/arch/sparc64/solaris/signal.c
===================================================================
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/svr4.h>

arch/um/kernel/signal_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/kernel/signal_kern.c
===================================================================
@@ -15,6 +15,7 @@
 #include "linux/tty.h"
 #include "linux/binfmts.h"
 #include "linux/ptrace.h"
+#include "linux/sighand.h"
 #include "asm/signal.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"

drivers/block/nbd.c +1 -0

Index: mm4-2.6.8.1/drivers/block/nbd.c
===================================================================
@@ -54,6 +54,7 @@
 #include <linux/errno.h>
 #include <linux/file.h>
 #include <linux/ioctl.h>
+#include <linux/signal.h>
 #include <net/sock.h>
 
 #include <linux/devfs_fs_kernel.h>

drivers/char/ftape/lowlevel/fdc-io.c +1 -0

Index: mm4-2.6.8.1/drivers/char/ftape/lowlevel/fdc-io.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/signal.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>

drivers/media/video/saa5249.c +1 -0

Index: mm4-2.6.8.1/drivers/media/video/saa5249.c
===================================================================
@@ -53,6 +53,7 @@
 #include <linux/i2c.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

drivers/mmc/mmc_queue.c +1 -0

Index: mm4-2.6.8.1/drivers/mmc/mmc_queue.c
===================================================================
@@ -10,6 +10,7 @@
  */
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/signal.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>

drivers/mtd/mtd_blkdevs.c +1 -0

Index: mm4-2.6.8.1/drivers/mtd/mtd_blkdevs.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/hdreg.h>
 #include <linux/init.h>
+#include <linux/sighand.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 #include <linux/devfs_fs_kernel.h>

fs/afs/internal.h +1 -0

Index: mm4-2.6.8.1/fs/afs/internal.h
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/signal.h>
 
 /*
  * debug tracing

fs/exec.c +1 -0

Index: mm4-2.6.8.1/fs/exec.c
===================================================================
@@ -47,6 +47,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>

fs/jffs/intrep.c +1 -0

Index: mm4-2.6.8.1/fs/jffs/intrep.c
===================================================================
@@ -67,6 +67,7 @@
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
+#include <linux/signal.h>
 
 #include "intrep.h"
 #include "jffs_fm.h"

fs/jffs2/background.c +1 -0

Index: mm4-2.6.8.1/fs/jffs2/background.c
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 #include "nodelist.h"

fs/lockd/clntproc.c +1 -0

Index: mm4-2.6.8.1/fs/lockd/clntproc.c
===================================================================
@@ -13,6 +13,7 @@
 #include <linux/nfs_fs.h>
 #include <linux/utsname.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>

fs/lockd/svc.c +1 -0

Index: mm4-2.6.8.1/fs/lockd/svc.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/stats.h>

fs/proc/task_nommu.c +1 -0

Index: mm4-2.6.8.1/fs/proc/task_nommu.c
===================================================================
@@ -2,6 +2,7 @@
 #include <linux/mm.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
+#include <linux/signal.h>
 
 /*
  * Logic: we've got two memory sums for each process, "shared", and

fs/reiser4/entd.c +1 -0

Index: mm4-2.6.8.1/fs/reiser4/entd.c
===================================================================
@@ -20,6 +20,7 @@
 #include <linux/writeback.h>
 #include <linux/time.h>         /* INITIAL_JIFFIES */
 #include <linux/backing-dev.h>  /* bdi_write_congested */
+#include <linux/signal.h>
 
 TYPE_SAFE_LIST_DEFINE(wbq, struct wbq, link);

fs/reiser4/ktxnmgrd.c +1 -0

Index: mm4-2.6.8.1/fs/reiser4/ktxnmgrd.c
===================================================================
@@ -34,6 +34,7 @@
 #include <linux/suspend.h>
 #include <linux/kernel.h>
 #include <linux/writeback.h>
+#include <linux/signal.h>
 
 static int scan_mgr(txn_mgr * mgr);

fs/reiser4/repacker.c +1 -0

Index: mm4-2.6.8.1/fs/reiser4/repacker.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/writeback.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <asm/atomic.h>

include/linux/init_task.h +1 -0

Index: mm4-2.6.8.1/include/linux/init_task.h
===================================================================
@@ -3,6 +3,7 @@
 
 #include <linux/file.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 #include <asm/resource.h>
 
 #define INIT_FILES \

include/linux/sched.h +3 ~~-18~~

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
@@ -20,10 +20,11 @@
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include <asm/mmu.h>
+#include <asm/signal.h>
+#include <asm/siginfo.h>
 
 #include <linux/smp.h>
 #include <linux/sem.h>
-#include <linux/signal.h>
 #include <linux/securebits.h>
 #include <linux/fs_struct.h>
 #include <linux/compiler.h>

@@ -253,11 +254,7 @@
 
 extern int mmlist_nr;
 
-struct sighand_struct {
-	atomic_t		count;
-	struct k_sigaction	action[_NSIG];
-	spinlock_t		siglock;
-};
+struct sighand_struct;
 
 struct sigpending {
 	struct list_head list;

@@ -704,18 +701,6 @@
 extern void flush_signal_handlers(struct task_struct *, int force_default);
 extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info);
 
-static inline int dequeue_signal_lock(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
-{
-	unsigned long flags;
-	int ret;
-
-	spin_lock_irqsave(&tsk->sighand->siglock, flags);
-	ret = dequeue_signal(tsk, mask, info);
-	spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
-
-	return ret;
-}	
-
 extern void block_all_signals(int (*notifier)(void *priv), void *priv,
 			      sigset_t *mask);
 extern void unblock_all_signals(void);

include/linux/signal.h +18 -0

Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
@@ -3,6 +3,7 @@
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <linux/sched.h>
 #include <asm/signal.h>
 #include <asm/siginfo.h>

@@ -22,6 +23,12 @@
 	struct user_struct *user;
 };
 
+struct sighand_struct {
+	atomic_t		count;
+	struct k_sigaction	action[_NSIG];
+	spinlock_t		siglock;
+};
+
 /* flags values. */
 #define SIGQUEUE_PREALLOC	1

@@ -206,6 +213,17 @@
 	INIT_LIST_HEAD(&sig->list);
 }
 
+static inline int dequeue_signal_lock(task_t *task, sigset_t *mask, siginfo_t *info)
+{
+	unsigned long flags;
+	int ret;
+
+	spin_lock_irqsave(&task->sighand->siglock, flags);
+	ret = dequeue_signal(task, mask, info);
+	spin_unlock_irqrestore(&task->sighand->siglock, flags);
+	return ret;
+}
+
 extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 extern long do_sigpending(void __user *, unsigned long);
 extern int sigprocmask(int, sigset_t *, sigset_t *);

kernel/exit.c +1 -0

Index: mm4-2.6.8.1/kernel/exit.c
===================================================================
@@ -28,6 +28,7 @@
 #include <linux/perfctr.h>
 #include <linux/cpu.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

kernel/kmod.c +1 -0

Index: mm4-2.6.8.1/kernel/kmod.c
===================================================================
@@ -36,6 +36,7 @@
 #include <linux/mount.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 
 extern int max_threads;

kernel/kthread.c +1 -0

Index: mm4-2.6.8.1/kernel/kthread.c
===================================================================
@@ -6,6 +6,7 @@
  * etc.).
  */
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kthread.h>
 #include <linux/completion.h>
 #include <linux/err.h>

kernel/power/process.c +1 -0

Index: mm4-2.6.8.1/kernel/power/process.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 /* 
  * Timeout for stopping processes

kernel/sys.c +1 -0

Index: mm4-2.6.8.1/kernel/sys.c
===================================================================
@@ -27,6 +27,7 @@
 #include <linux/suspend.h>
 #include <linux/key.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>

net/ipv4/ipvs/ip_vs_sync.c +1 -0

Index: mm4-2.6.8.1/net/ipv4/ipvs/ip_vs_sync.c
===================================================================
@@ -22,6 +22,7 @@
 #include <linux/slab.h>
 #include <linux/net.h>
 #include <linux/completion.h>
+#include <linux/signal.h>
 
 #include <linux/skbuff.h>
 #include <linux/in.h>

net/rxrpc/internal.h +1 -0

Index: mm4-2.6.8.1/net/rxrpc/internal.h
===================================================================
@@ -8,6 +8,7 @@
 
 #include <linux/compiler.h>
 #include <linux/kernel.h>
+#include <linux/signal.h>
 
 /*
  * debug accounting

net/sunrpc/clnt.c +1 -0

Index: mm4-2.6.8.1/net/sunrpc/clnt.c
===================================================================
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/in.h>
 #include <linux/utsname.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/clnt.h>
 #include <linux/workqueue.h>

net/sunrpc/sched.c +1 -0

Index: mm4-2.6.8.1/net/sunrpc/sched.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/xprt.h>

net/sunrpc/svc.c +1 -0

Index: mm4-2.6.8.1/net/sunrpc/svc.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/net.h>
 #include <linux/in.h>
 #include <linux/mm.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/xdr.h>

security/selinux/hooks.c +1 -0

Index: mm4-2.6.8.1/security/selinux/hooks.c
===================================================================
@@ -64,6 +64,7 @@
 #include <net/ipv6.h>
 #include <linux/hugetlb.h>
 #include <linux/personality.h>
+#include <linux/signal.h>
 
 #include "avc.h"
 #include "objsec.h"

William Lee Irwin III

2004-08-25 19:50 UTC #12 lore raw

PATCH 4/4 move signal_struct to signal.h

Quoted 1 line · William Lee Irwin III

Quoted 1 line
Move sigpending -related bits to include/linux/sched.h

Quoted 1 line · William Lee Irwin III

Move sighand_struct -related bits over to include/linux/signal.h

Move signal_struct -related bits over to include/linux/signal.h

arch/i386/mach-voyager/voyager_thread.c +1 -0

Index: mm4-2.6.8.1/arch/i386/mach-voyager/voyager_thread.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/kmod.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <asm/desc.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>

arch/ia64/kernel/unaligned.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/kernel/unaligned.c
===================================================================
@@ -15,6 +15,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/smp_lock.h>
 #include <linux/tty.h>

arch/sparc64/solaris/misc.c +1 -0

Index: mm4-2.6.8.1/arch/sparc64/solaris/misc.c
===================================================================
@@ -17,6 +17,7 @@
 #include <linux/timex.h>
 #include <linux/major.h>
 #include <linux/compat.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/string.h>

drivers/char/vt.c +1 -0

Index: mm4-2.6.8.1/drivers/char/vt.c
===================================================================
@@ -101,6 +101,7 @@
 #include <linux/bootmem.h>
 #include <linux/pm.h>
 #include <linux/font.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/system.h>

drivers/char/vt_ioctl.c +1 -0

Index: mm4-2.6.8.1/drivers/char/vt_ioctl.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/tty.h>
 #include <linux/timer.h>
 #include <linux/kernel.h>

drivers/net/slip.c +1 -0

Index: mm4-2.6.8.1/drivers/net/slip.c
===================================================================
@@ -66,6 +66,7 @@
 #include <linux/interrupt.h>
 #include <linux/in.h>
 #include <linux/tty.h>
+#include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>

drivers/s390/char/keyboard.c +1 -0

Index: mm4-2.6.8.1/drivers/s390/char/keyboard.c
===================================================================
@@ -10,6 +10,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/sysrq.h>
 
 #include <linux/kbd_kern.h>

fs/autofs/autofs_i.h +1 -0

Index: mm4-2.6.8.1/fs/autofs/autofs_i.h
===================================================================
@@ -27,6 +27,7 @@
 #include <linux/namei.h>
 #include <linux/mount.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>

fs/autofs4/autofs_i.h +1 -0

Index: mm4-2.6.8.1/fs/autofs4/autofs_i.h
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/string.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mount.h>
 #include <linux/namei.h>
 #include <asm/current.h>

fs/devfs/base.c +1 -0

Index: mm4-2.6.8.1/fs/devfs/base.c
===================================================================
@@ -676,6 +676,7 @@
 #include <linux/smp.h>
 #include <linux/rwsem.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/namei.h>
 
 #include <asm/uaccess.h>

include/linux/sched.h +1 ~~-61~~

86 lines not on this page · raw message

include/linux/signal.h +61 -0

79 lines not on this page · raw message

kernel/pid.c +1 -0

Index: mm4-2.6.8.1/kernel/pid.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/hash.h>
+#include <linux/signal.h>
 
 #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift)
 static struct hlist_head *pid_hash[PIDTYPE_MAX];

net/bridge/netfilter/ebtables.c +1 -0

Index: mm4-2.6.8.1/net/bridge/netfilter/ebtables.c
===================================================================
@@ -17,6 +17,7 @@
 
 /* used for print_string */
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/tty.h>
 
 #include <linux/kmod.h>

net/ipv4/netfilter/ipt_owner.c +1 -0

Index: mm4-2.6.8.1/net/ipv4/netfilter/ipt_owner.c
===================================================================
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/file.h>
+#include <linux/signal.h>
 #include <net/sock.h>
 
 #include <linux/netfilter_ipv4/ipt_owner.h>

net/ipv6/netfilter/ip6t_owner.c +1 -0

Index: mm4-2.6.8.1/net/ipv6/netfilter/ip6t_owner.c
===================================================================
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/file.h>
+#include <linux/signal.h>
 #include <net/sock.h>
 
 #include <linux/netfilter_ipv6/ip6t_owner.h>

William Lee Irwin III

2004-08-25 21:32 UTC #13 lore raw

[5/4] move most signal functions to signal.h

Quoted 1 line · William Lee Irwin III

Move signal_struct -related bits over to include/linux/signal.h

Move signal-related function declarations over to include/linux/signal.h It was kind of painful to doublecheck the grepping for false positives, so some unnecessary inclusions may be introduced here.

arch/alpha/kernel/osf_sys.c +1 -0

Index: mm4-2.6.8.1/arch/alpha/kernel/osf_sys.c
===================================================================
@@ -12,6 +12,7 @@
 
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/smp.h>

arch/alpha/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/alpha/kernel/traps.c
===================================================================
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kallsyms.h>
+#include <linux/signal.h>
 
 #include <asm/gentrap.h>
 #include <asm/uaccess.h>

arch/arm/kernel/apm.c +1 -0

Index: mm4-2.6.8.1/arch/arm/kernel/apm.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/completion.h>
+#include <linux/signal.h>
 
 #include <asm/apm.h> /* apm_power_info */
 #include <asm/system.h>

arch/arm/kernel/armksyms.c +1 -0

Index: mm4-2.6.8.1/arch/arm/kernel/armksyms.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/in6.h>
 #include <linux/syscalls.h>
+#include <linux/signal.h>
 
 #include <asm/checksum.h>
 #include <asm/io.h>

arch/arm/mm/alignment.c +1 -0

Index: mm4-2.6.8.1/arch/arm/mm/alignment.c
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/ptrace.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>

arch/arm26/kernel/armksyms.c +1 -0

Index: mm4-2.6.8.1/arch/arm26/kernel/armksyms.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/vt_kern.h>
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
+#include <linux/signal.h>
 
 #include <asm/user.h>
 #include <asm/byteorder.h>

arch/cris/arch-v10/kernel/ptrace.c +1 -0

Index: mm4-2.6.8.1/arch/cris/arch-v10/kernel/ptrace.c
===================================================================
@@ -9,6 +9,7 @@
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
+#include <linux/signal.h>
 
 #include <asm/user.h>
 #include <asm/uaccess.h>

arch/cris/mm/fault.c +1 -0

Index: mm4-2.6.8.1/arch/cris/mm/fault.c
===================================================================
@@ -99,6 +99,7 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 
 extern int find_fixup_code(struct pt_regs *);

arch/h8300/platform/h8300h/ptrace_h8300h.c +1 -0

Index: mm4-2.6.8.1/arch/h8300/platform/h8300h/ptrace_h8300h.c
===================================================================
@@ -11,6 +11,7 @@
 
 #include <linux/linkage.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <asm/ptrace.h>
 
 #define CCR_MASK 0x6f    /* mode/imask not set */

arch/h8300/platform/h8s/ptrace_h8s.c +1 -0

Index: mm4-2.6.8.1/arch/h8300/platform/h8s/ptrace_h8s.c
===================================================================
@@ -11,6 +11,7 @@
 
 #include <linux/linkage.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/errno.h>
 #include <asm/ptrace.h>

arch/i386/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/i386/kernel/traps.c
===================================================================
@@ -13,6 +13,7 @@
  */
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

arch/ia64/ia32/ia32_support.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/ia32/ia32_support.c
===================================================================
@@ -17,6 +17,7 @@
 #include <linux/mm.h>
 #include <linux/personality.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include <asm/intrinsics.h>
 #include <asm/page.h>

arch/ia64/ia32/ia32_traps.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/ia32/ia32_traps.c
===================================================================
@@ -11,6 +11,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include "ia32priv.h"

arch/ia64/kernel/brl_emu.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/kernel/brl_emu.c
===================================================================
@@ -9,6 +9,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>

arch/ia64/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/kernel/traps.c
===================================================================
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/tty.h>
 #include <linux/vt_kern.h>		/* For unblank_screen() */
 #include <linux/module.h>       /* for EXPORT_SYMBOL */

arch/ia64/mm/fault.c +1 -0

Index: mm4-2.6.8.1/arch/ia64/mm/fault.c
===================================================================
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
+#include <linux/signal.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>

arch/m68k/kernel/ptrace.c +1 -0

Index: mm4-2.6.8.1/arch/m68k/kernel/ptrace.c
===================================================================
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/config.h>
+#include <linux/signal.h>
 
 #include <asm/user.h>
 #include <asm/uaccess.h>

arch/m68k/mm/fault.c +1 -0

Index: mm4-2.6.8.1/arch/m68k/mm/fault.c
===================================================================
@@ -10,6 +10,7 @@
 #include <linux/ptrace.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 #include <asm/setup.h>
 #include <asm/traps.h>

arch/m68knommu/kernel/ptrace.c +1 -0

Index: mm4-2.6.8.1/arch/m68knommu/kernel/ptrace.c
===================================================================
@@ -12,6 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>

arch/mips/au1000/db1x00/mirage_ts.c +1 -0

Index: mm4-2.6.8.1/arch/mips/au1000/db1x00/mirage_ts.c
===================================================================
@@ -42,6 +42,7 @@
 #include <linux/proc_fs.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 
 #include <asm/segment.h>
 #include <asm/irq.h>

arch/mips/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/mips/kernel/traps.c
===================================================================
@@ -20,6 +20,7 @@
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/kallsyms.h>
+#include <linux/signal.h>
 
 #include <asm/bootinfo.h>
 #include <asm/branch.h>

arch/mips/sgi-ip22/ip22-berr.c +1 -0

Index: mm4-2.6.8.1/arch/mips/sgi-ip22/ip22-berr.c
===================================================================
@@ -7,6 +7,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include <asm/addrspace.h>
 #include <asm/system.h>

arch/mips/sgi-ip22/ip22-reset.c +1 -0

Index: mm4-2.6.8.1/arch/mips/sgi-ip22/ip22-reset.c
===================================================================
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <linux/notifier.h>
 #include <linux/timer.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>

arch/mips/sgi-ip27/ip27-berr.c +1 -0

Index: mm4-2.6.8.1/arch/mips/sgi-ip27/ip27-berr.c
===================================================================
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 #include <asm/module.h>
 #include <asm/sn/addrs.h>

arch/mips/sgi-ip32/ip32-berr.c +1 -0

Index: mm4-2.6.8.1/arch/mips/sgi-ip32/ip32-berr.c
===================================================================
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
 #include <asm/addrspace.h>

arch/mips/sgi-ip32/ip32-reset.c +1 -0

Index: mm4-2.6.8.1/arch/mips/sgi-ip32/ip32-reset.c
===================================================================
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/notifier.h>
 #include <linux/delay.h>
 #include <linux/ds17287rtc.h>

arch/parisc/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/parisc/kernel/traps.c
===================================================================
@@ -12,6 +12,7 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

arch/parisc/kernel/unaligned.c +1 -0

Index: mm4-2.6.8.1/arch/parisc/kernel/unaligned.c
===================================================================
@@ -23,6 +23,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 /* #define DEBUG_UNALIGNED 1 */

arch/parisc/math-emu/driver.c +1 -0

Index: mm4-2.6.8.1/arch/parisc/math-emu/driver.c
===================================================================
@@ -29,6 +29,7 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include "float.h"
 #include "math-emu.h"

arch/parisc/mm/fault.c +1 -0

Index: mm4-2.6.8.1/arch/parisc/mm/fault.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/mm.h>
 #include <linux/ptrace.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>

arch/ppc/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/ppc/kernel/traps.c
===================================================================
@@ -18,6 +18,7 @@
 
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/stddef.h>

arch/ppc64/kernel/mf.c +1 -0

Index: mm4-2.6.8.1/arch/ppc64/kernel/mf.c
===================================================================
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 #include <linux/completion.h>
 #include <asm/iSeries/HvLpConfig.h>
 #include <linux/slab.h>

arch/ppc64/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/ppc64/kernel/traps.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/stddef.h>

arch/s390/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/s390/kernel/traps.c
===================================================================
@@ -16,6 +16,7 @@
  */
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

arch/sh/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/sh/kernel/traps.c
===================================================================
@@ -14,6 +14,7 @@
  */
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

arch/sh64/kernel/ptrace.c +1 -0

Index: mm4-2.6.8.1/arch/sh64/kernel/ptrace.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/rwsem.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>

arch/sh64/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/sh64/kernel/traps.c
===================================================================
@@ -16,6 +16,7 @@
  * state in 'entry.S'.
  */
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

arch/sparc/kernel/sys_solaris.c +1 -0

Index: mm4-2.6.8.1/arch/sparc/kernel/sys_solaris.c
===================================================================
@@ -6,6 +6,7 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

arch/sparc/kernel/sys_sparc.c +1 -0

Index: mm4-2.6.8.1/arch/sparc/kernel/sys_sparc.c
===================================================================
@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/file.h>

arch/sparc/kernel/unaligned.c +1 -0

Index: mm4-2.6.8.1/arch/sparc/kernel/unaligned.c
===================================================================
@@ -9,6 +9,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <asm/ptrace.h>

arch/sparc64/kernel/sys_sparc.c +1 -0

Index: mm4-2.6.8.1/arch/sparc64/kernel/sys_sparc.c
===================================================================
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/mm.h>

arch/um/drivers/line.c +1 -0

Index: mm4-2.6.8.1/arch/um/drivers/line.c
===================================================================
@@ -4,6 +4,7 @@
  */
 
 #include "linux/sched.h"
+#include "linux/signal.h"
 #include "linux/slab.h"
 #include "linux/list.h"
 #include "linux/interrupt.h"

arch/um/drivers/port_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/drivers/port_kern.c
===================================================================
@@ -5,6 +5,7 @@
 
 #include "linux/list.h"
 #include "linux/sched.h"
+#include "linux/signal.h"
 #include "linux/slab.h"
 #include "linux/interrupt.h"
 #include "linux/irq.h"

arch/um/drivers/ubd_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/drivers/ubd_kern.c
===================================================================
@@ -35,6 +35,7 @@
 #include "linux/blkpg.h"
 #include "linux/genhd.h"
 #include "linux/spinlock.h"
+#include "linux/signal.h"
 #include "asm/segment.h"
 #include "asm/uaccess.h"
 #include "asm/irq.h"

arch/um/include/kern_util.h +1 -0

Index: mm4-2.6.8.1/arch/um/include/kern_util.h
===================================================================
@@ -7,6 +7,7 @@
 #define __KERN_UTIL_H__
 
 #include "linux/threads.h"
+#include "linux/signal.h"
 #include "sysdep/ptrace.h"
 
 extern int ncpus;

arch/um/kernel/process_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/kernel/process_kern.c
===================================================================
@@ -6,6 +6,7 @@
 #include "linux/config.h"
 #include "linux/kernel.h"
 #include "linux/sched.h"
+#include "linux/signal.h"
 #include "linux/interrupt.h"
 #include "linux/mm.h"
 #include "linux/slab.h"

arch/um/kernel/reboot.c +1 -0

Index: mm4-2.6.8.1/arch/um/kernel/reboot.c
===================================================================
@@ -5,6 +5,7 @@
 
 #include "linux/module.h"
 #include "linux/sched.h"
+#include "linux/signal.h"
 #include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"

arch/um/kernel/trap_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/kernel/trap_kern.c
===================================================================
@@ -6,6 +6,7 @@
 #include "linux/kernel.h"
 #include "asm/errno.h"
 #include "linux/sched.h"
+#include "linux/signal.h"
 #include "linux/mm.h"
 #include "linux/spinlock.h"
 #include "linux/config.h"

arch/um/kernel/tt/syscall_kern.c +1 -0

Index: mm4-2.6.8.1/arch/um/kernel/tt/syscall_kern.c
===================================================================
@@ -7,6 +7,7 @@
 #include "linux/utime.h"
 #include "linux/sys.h"
 #include "linux/ptrace.h"
+#include "linux/signal.h"
 #include "asm/unistd.h"
 #include "asm/ptrace.h"
 #include "asm/uaccess.h"

arch/v850/kernel/ptrace.c +1 -0

Index: mm4-2.6.8.1/arch/v850/kernel/ptrace.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/smp_lock.h>
 #include <linux/ptrace.h>

arch/x86_64/kernel/traps.c +1 -0

Index: mm4-2.6.8.1/arch/x86_64/kernel/traps.c
===================================================================
@@ -16,6 +16,7 @@
  */
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>

drivers/block/pktcdvd.c +1 -0

Index: mm4-2.6.8.1/drivers/block/pktcdvd.c
===================================================================
@@ -46,6 +46,7 @@
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_ioctl.h>

drivers/char/drm/drmP.h +1 -0

Index: mm4-2.6.8.1/drivers/char/drm/drmP.h
===================================================================
@@ -55,6 +55,7 @@
 #include <linux/jiffies.h>
 #include <linux/smp_lock.h>	/* For (un)lock_kernel */
 #include <linux/mm.h>
+#include <linux/signal.h>
 #if defined(__alpha__) || defined(__powerpc__)
 #include <asm/pgtable.h> /* For pte_wrprotect */
 #endif

drivers/char/drm/drm_irq.h +1 -0

Index: mm4-2.6.8.1/drivers/char/drm/drm_irq.h
===================================================================
@@ -36,6 +36,7 @@
 #include "drmP.h"
 
 #include <linux/interrupt.h>	/* For task queue support */
+#include <linux/signal.h>
 
 #ifndef __HAVE_SHARED_IRQ
 #define __HAVE_SHARED_IRQ	0

drivers/char/keyboard.c +1 -0

Index: mm4-2.6.8.1/drivers/char/keyboard.c
===================================================================
@@ -27,6 +27,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/mm.h>

drivers/char/nwbutton.c +1 -0

Index: mm4-2.6.8.1/drivers/char/nwbutton.c
===================================================================
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/timer.h>

drivers/char/sysrq.c +1 -0

Index: mm4-2.6.8.1/drivers/char/sysrq.c
===================================================================
@@ -14,6 +14,7 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/fs.h>

drivers/input/serio/serio.c +1 -0

Index: mm4-2.6.8.1/drivers/input/serio/serio.c
===================================================================
@@ -33,6 +33,7 @@
 #include <linux/wait.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/smp_lock.h>
 #include <linux/suspend.h>
 #include <linux/slab.h>

drivers/macintosh/adb.c +1 -0

Index: mm4-2.6.8.1/drivers/macintosh/adb.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/smp_lock.h>
 #include <linux/adb.h>
 #include <linux/cuda.h>

drivers/md/md.c +1 -0

Index: mm4-2.6.8.1/drivers/md/md.c
===================================================================
@@ -37,6 +37,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <linux/init.h>

drivers/media/dvb/dvb-core/dvb_ca_en50221.c +1 -0

Index: mm4-2.6.8.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
===================================================================
@@ -34,6 +34,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
+#include <linux/signal.h>
 #include <asm/semaphore.h>
 #include <asm/atomic.h>

drivers/media/dvb/dvb-core/dvb_frontend.c +1 -0

Index: mm4-2.6.8.1/drivers/media/dvb/dvb-core/dvb_frontend.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/list.h>
+#include <linux/signal.h>
 #include <asm/processor.h>
 #include <asm/semaphore.h>

drivers/net/8139too.c +1 -0

Index: mm4-2.6.8.1/drivers/net/8139too.c
===================================================================
@@ -109,6 +109,7 @@
 #include <linux/completion.h>
 #include <linux/crc32.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>

drivers/net/eql.c +1 -0

Index: mm4-2.6.8.1/drivers/net/eql.c
===================================================================
@@ -116,6 +116,7 @@
 #include <linux/init.h>
 #include <linux/timer.h>
 #include <linux/netdevice.h>
+#include <linux/signal.h>
 
 #include <linux/if.h>
 #include <linux/if_arp.h>

drivers/net/irda/stir4200.c +1 -0

Index: mm4-2.6.8.1/drivers/net/irda/stir4200.c
===================================================================
@@ -51,6 +51,7 @@
 #include <linux/delay.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
+#include <linux/signal.h>
 #include <net/irda/irda.h>
 #include <net/irda/irlap.h>
 #include <net/irda/irda_device.h>

drivers/net/wireless/airo.c +1 -0

Index: mm4-2.6.8.1/drivers/net/wireless/airo.c
===================================================================
@@ -34,6 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/in.h>
+#include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/bitops.h>

drivers/parisc/power.c +1 -0

Index: mm4-2.6.8.1/drivers/parisc/power.c
===================================================================
@@ -43,6 +43,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>

drivers/perfctr/virtual.c +1 -0

Index: mm4-2.6.8.1/drivers/perfctr/virtual.c
===================================================================
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/perfctr.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

drivers/s390/char/fs3270.c +1 -0

Index: mm4-2.6.8.1/drivers/s390/char/fs3270.c
===================================================================
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/signal.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>

drivers/s390/net/qeth_main.c +1 -0

Index: mm4-2.6.8.1/drivers/s390/net/qeth_main.c
===================================================================
@@ -56,6 +56,7 @@
 #include <linux/inetdevice.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/workqueue.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>

drivers/s390/s390mach.c +1 -0

Index: mm4-2.6.8.1/drivers/s390/s390mach.c
===================================================================
@@ -11,6 +11,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/workqueue.h>

drivers/sbus/char/bbc_envctrl.c +1 -0

Index: mm4-2.6.8.1/drivers/sbus/char/bbc_envctrl.c
===================================================================
@@ -6,6 +6,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <asm/oplib.h>

drivers/sbus/char/envctrl.c +1 -0

Index: mm4-2.6.8.1/drivers/sbus/char/envctrl.c
===================================================================
@@ -22,6 +22,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>

drivers/scsi/aacraid/linit.c +1 -0

Index: mm4-2.6.8.1/drivers/scsi/aacraid/linit.c
===================================================================
@@ -45,6 +45,7 @@
 #include <linux/syscalls.h>
 #include <linux/ioctl32.h>
 #include <linux/delay.h>
+#include <linux/signal.h>
 #include <asm/semaphore.h>
 
 #include <scsi/scsi.h>

drivers/scsi/cpqfcTSinit.c +1 -0

Index: mm4-2.6.8.1/drivers/scsi/cpqfcTSinit.c
===================================================================
@@ -45,6 +45,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>  // request_region() prototype
 #include <linux/completion.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>   // ioctl related

drivers/scsi/qla2xxx/qla_os.c +1 -0

Index: mm4-2.6.8.1/drivers/scsi/qla2xxx/qla_os.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsicam.h>

drivers/usb/core/hub.c +1 -0

Index: mm4-2.6.8.1/drivers/usb/core/hub.c
===================================================================
@@ -20,6 +20,7 @@
 #include <linux/moduleparam.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>

drivers/usb/core/inode.c +1 -0

Index: mm4-2.6.8.1/drivers/usb/core/inode.c
===================================================================
@@ -39,6 +39,7 @@
 #include <linux/usbdevice_fs.h>
 #include <linux/smp_lock.h>
 #include <linux/parser.h>
+#include <linux/signal.h>
 #include <asm/byteorder.h>
 
 static struct super_operations usbfs_ops;

drivers/w1/w1.c +1 -0

Index: mm4-2.6.8.1/drivers/w1/w1.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/suspend.h>
 
 #include "w1.h"

drivers/w1/w1_int.c +1 -0

Index: mm4-2.6.8.1/drivers/w1/w1_int.c
===================================================================
@@ -21,6 +21,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/signal.h>
 
 #include "w1.h"
 #include "w1_log.h"

fs/buffer.c +1 -0

Index: mm4-2.6.8.1/fs/buffer.c
===================================================================
@@ -37,6 +37,7 @@
 #include <linux/bio.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
+#include <linux/signal.h>
 #include <asm/bitops.h>
 
 static void invalidate_bh_lrus(void);

fs/cifs/cifsfs.c +1 -0

Index: mm4-2.6.8.1/fs/cifs/cifsfs.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/seq_file.h>
 #include <linux/vfs.h>
 #include <linux/mempool.h>
+#include <linux/signal.h>
 #include "cifsfs.h"
 #include "cifspdu.h"
 #define DECLARE_GLOBALS_HERE

fs/cifs/connect.c +1 -0

Index: mm4-2.6.8.1/fs/cifs/connect.c
===================================================================
@@ -29,6 +29,7 @@
 #include <linux/ctype.h>
 #include <linux/utsname.h>
 #include <linux/mempool.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include "cifspdu.h"

fs/dnotify.c +1 -0

Index: mm4-2.6.8.1/fs/dnotify.c
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/dnotify.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>

fs/jffs/inode-v23.c +1 -0

Index: mm4-2.6.8.1/fs/jffs/inode-v23.c
===================================================================
@@ -42,6 +42,7 @@
 #include <linux/quotaops.h>
 #include <linux/highmem.h>
 #include <linux/vfs.h>
+#include <linux/signal.h>
 #include <asm/semaphore.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>

fs/ncpfs/file.c +1 -0

Index: mm4-2.6.8.1/fs/ncpfs/file.c
===================================================================
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
+#include <linux/signal.h>
 
 #include <linux/ncp_fs.h>
 #include "ncplib_kernel.h"

fs/ncpfs/inode.c +1 -0

Index: mm4-2.6.8.1/fs/ncpfs/inode.c
===================================================================
@@ -29,6 +29,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/vfs.h>
+#include <linux/signal.h>
 
 #include <linux/ncp_fs.h>

fs/nfs/direct.c +1 -0

Index: mm4-2.6.8.1/fs/nfs/direct.c
===================================================================
@@ -39,6 +39,7 @@
 #include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/smp_lock.h>
 #include <linux/file.h>

fs/nfsd/nfssvc.c +1 -0

Index: mm4-2.6.8.1/fs/nfsd/nfssvc.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/fs_struct.h>
+#include <linux/signal.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/stats.h>

fs/pipe.c +1 -0

Index: mm4-2.6.8.1/fs/pipe.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/mount.h>
 #include <linux/pipe_fs_i.h>
 #include <linux/uio.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>

fs/smbfs/inode.c +1 -0

Index: mm4-2.6.8.1/fs/smbfs/inode.c
===================================================================
@@ -29,6 +29,7 @@
 #include <linux/smb_fs.h>
 #include <linux/smbno.h>
 #include <linux/smb_mount.h>
+#include <linux/signal.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>

fs/smbfs/smbiod.c +1 -0

Index: mm4-2.6.8.1/fs/smbfs/smbiod.c
===================================================================
@@ -8,6 +8,7 @@
 #include <linux/config.h>
 
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>

include/linux/fs.h +1 -0

Index: mm4-2.6.8.1/include/linux/fs.h
===================================================================
@@ -18,6 +18,7 @@
 #include <linux/cache.h>
 #include <linux/prio_tree.h>
 #include <linux/kobject.h>
+#include <linux/signal.h>
 #include <asm/atomic.h>
 
 struct iovec;

include/linux/sched.h +0 ~~-32~~

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
@@ -638,32 +638,6 @@
 extern int in_egroup_p(gid_t);
 
 extern void proc_caches_init(void);
-extern void flush_signals(struct task_struct *);
-extern void flush_signal_handlers(struct task_struct *, int force_default);
-extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info);
-
-extern void block_all_signals(int (*notifier)(void *priv), void *priv,
-			      sigset_t *mask);
-extern void unblock_all_signals(void);
-extern void release_task(struct task_struct * p);
-extern int send_sig_info(int, struct siginfo *, struct task_struct *);
-extern int send_group_sig_info(int, struct siginfo *, struct task_struct *);
-extern int force_sig_info(int, struct siginfo *, struct task_struct *);
-extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
-extern int kill_pg_info(int, struct siginfo *, pid_t);
-extern int kill_sl_info(int, struct siginfo *, pid_t);
-extern int kill_proc_info(int, struct siginfo *, pid_t);
-extern void do_notify_parent(struct task_struct *, int);
-extern void force_sig(int, struct task_struct *);
-extern void force_sig_specific(int, struct task_struct *);
-extern int send_sig(int, struct task_struct *, int);
-extern void zap_other_threads(struct task_struct *p);
-extern int kill_pg(pid_t, int, int);
-extern int kill_sl(pid_t, int, int);
-extern int kill_proc(pid_t, int, int);
-extern int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *);
-extern int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long);
-
 /* These can be the second arg to send_sig_info/send_group_sig_info.  */
 #define SEND_SIG_NOINFO ((struct siginfo *) 0)
 #define SEND_SIG_PRIV	((struct siginfo *) 1)

@@ -723,17 +697,11 @@
 
 extern void exit_mm(struct task_struct *);
 extern void exit_files(struct task_struct *);
-extern void exit_signal(struct task_struct *);
-extern void __exit_signal(struct task_struct *);
-extern void exit_sighand(struct task_struct *);
-extern void __exit_sighand(struct task_struct *);
 
 extern NORET_TYPE void do_group_exit(int);
 
 extern void reparent_to_init(void);
 extern void daemonize(const char *, ...);
-extern int allow_signal(int);
-extern int disallow_signal(int);
 extern task_t *child_reaper;
 
 extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *);

include/linux/signal.h +29 -0

Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
@@ -268,6 +268,7 @@
 	INIT_LIST_HEAD(&sig->list);
 }
 
+int dequeue_signal(task_t *, sigset_t *, siginfo_t *);
 static inline int dequeue_signal_lock(task_t *task, sigset_t *mask, siginfo_t *info)
 {
 	unsigned long flags;

@@ -292,6 +293,34 @@
 int send_sigqueue(int, struct sigqueue *, struct task_struct *);
 int send_group_sigqueue(int, struct sigqueue *, struct task_struct *);
 void exit_itimers(struct signal_struct *);
+void flush_signals(task_t *);
+void flush_signal_handlers(task_t *, int force_default);
+void block_all_signals(int (*)(void *), void *, sigset_t *);
+void unblock_all_signals(void);
+void release_task(task_t *);
+int send_sig_info(int, struct siginfo *, task_t *);
+int send_group_sig_info(int, struct siginfo *, task_t *);
+int force_sig_info(int, struct siginfo *, task_t *);
+int __kill_pg_info(int, struct siginfo *, pid_t);
+int kill_pg_info(int, struct siginfo *, pid_t);
+int kill_sl_info(int, struct siginfo *, pid_t);
+int kill_proc_info(int, struct siginfo *, pid_t);
+void do_notify_parent(task_t *, int);
+void force_sig(int, task_t *);
+void force_sig_specific(int, task_t *);
+int send_sig(int, task_t *, int);
+void zap_other_threads(task_t *);
+int kill_pg(pid_t, int, int);
+int kill_sl(pid_t, int, int);
+int kill_proc(pid_t, int, int);
+int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *);
+int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long);
+void exit_signal(task_t *);
+void __exit_signal(task_t *);
+void exit_sighand(task_t *);
+void __exit_sighand(task_t *);
+int allow_signal(int);
+int disallow_signal(int);
 
 #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
 struct pt_regs;

ipc/mqueue.c +1 -0

Index: mm4-2.6.8.1/ipc/mqueue.c
===================================================================
@@ -23,6 +23,7 @@
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 #include <net/sock.h>
 #include "util.h"

kernel/exec_domain.c +1 -0

Index: mm4-2.6.8.1/kernel/exec_domain.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/personality.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/sysctl.h>
 #include <linux/types.h>

kernel/futex.c +1 -0

Index: mm4-2.6.8.1/kernel/futex.c
===================================================================
@@ -39,6 +39,7 @@
 #include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
+#include <linux/signal.h>
 
 #define FUTEX_HASHBITS 8

kernel/timer.c +1 -0

Index: mm4-2.6.8.1/kernel/timer.c
===================================================================
@@ -32,6 +32,7 @@
 #include <linux/jiffies.h>
 #include <linux/cpu.h>
 #include <linux/perfctr.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

mm/memory.c +1 -0

Index: mm4-2.6.8.1/mm/memory.c
===================================================================
@@ -46,6 +46,7 @@
 #include <linux/rmap.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/signal.h>
 
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>

mm/nommu.c +1 -0

Index: mm4-2.6.8.1/mm/nommu.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/vmalloc.h>
 #include <linux/blkdev.h>
 #include <linux/backing-dev.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/tlb.h>

mm/oom_kill.c +1 -0

Index: mm4-2.6.8.1/mm/oom_kill.c
===================================================================
@@ -20,6 +20,7 @@
 #include <linux/swap.h>
 #include <linux/timex.h>
 #include <linux/jiffies.h>
+#include <linux/signal.h>
 
 /* #define DEBUG */

net/atm/common.c +1 -0

Index: mm4-2.6.8.1/net/atm/common.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/capability.h>
 #include <linux/mm.h>		/* verify_area */
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/time.h>		/* struct timeval */
 #include <linux/skbuff.h>
 #include <linux/bitops.h>

net/ax25/af_ax25.c +1 -0

Index: mm4-2.6.8.1/net/ax25/af_ax25.c
===================================================================
@@ -21,6 +21,7 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>

net/core/sock.c +1 -0

Index: mm4-2.6.8.1/net/core/sock.c
===================================================================
@@ -100,6 +100,7 @@
 #include <linux/major.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

net/decnet/af_decnet.c +1 -0

Index: mm4-2.6.8.1/net/decnet/af_decnet.c
===================================================================
@@ -108,6 +108,7 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

net/ipv4/tcp_input.c +1 -0

Index: mm4-2.6.8.1/net/ipv4/tcp_input.c
===================================================================
@@ -71,6 +71,7 @@
 #include <net/tcp.h>
 #include <net/inet_common.h>
 #include <linux/ipsec.h>
+#include <linux/signal.h>
 
 int sysctl_tcp_timestamps = 1;
 int sysctl_tcp_window_scaling = 1;

net/ipv4/tcp_minisocks.c +1 -0

Index: mm4-2.6.8.1/net/ipv4/tcp_minisocks.c
===================================================================
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/workqueue.h>
+#include <linux/signal.h>
 #include <net/tcp.h>
 #include <net/inet_common.h>
 #include <net/xfrm.h>

net/irda/af_irda.c +1 -0

Index: mm4-2.6.8.1/net/irda/af_irda.c
===================================================================
@@ -51,6 +51,7 @@
 #include <linux/net.h>
 #include <linux/irda.h>
 #include <linux/poll.h>
+#include <linux/signal.h>
 
 #include <asm/ioctls.h>		/* TIOCOUTQ, TIOCINQ */
 #include <asm/uaccess.h>

net/netrom/af_netrom.c +1 -0

Index: mm4-2.6.8.1/net/netrom/af_netrom.c
===================================================================
@@ -17,6 +17,7 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

net/rose/af_rose.c +1 -0

Index: mm4-2.6.8.1/net/rose/af_rose.c
===================================================================
@@ -19,6 +19,7 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/string.h>

net/sctp/socket.c +1 -0

Index: mm4-2.6.8.1/net/sctp/socket.c
===================================================================
@@ -67,6 +67,7 @@
 #include <linux/poll.h>
 #include <linux/init.h>
 #include <linux/crypto.h>
+#include <linux/signal.h>
 
 #include <net/ip.h>
 #include <net/icmp.h>

net/x25/af_x25.c +1 -0

Index: mm4-2.6.8.1/net/x25/af_x25.c
===================================================================
@@ -39,6 +39,7 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

net/x25/x25_in.c +1 -0

Index: mm4-2.6.8.1/net/x25/x25_in.c
===================================================================
@@ -29,6 +29,7 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>

Tim Schmielau

2004-08-26 00:01 UTC #14 lore raw

PATCH 1/1 remove 450 unnecessary #includes of sched.h

In reply to William Lee Irwin III

Quoted 1 line · William Lee Irwin III

I hereby declare open season on linux/sched.h!

OK, let's go! ;-)

Let's see how often we can kill it's include lines. To start from a clean base, I looked at vanilla 2.6.8.1 first before trying out your patches.

analysis was i386-only, my personal config builds, allyesconfig does not (neither does it with an unpatched kernel)

no signed-off line, since this patch is just for fun and not to be included into any serious tree (yet).

No patch either, since I just realized it's over 200k in size. So here's the URL:

http://www.physik3.uni-rostock.de/tim/kernel/2.6/desched-2.6.8.1-02.patch.gz

Tim

Tim Schmielau

2004-08-20 15:08 UTC #15 lore raw

In reply to Dave Jones

Quoted 13 lines · Dave Jones

I noticed that every file that could be built as a module was sucking in sched.h (and therefore, every other include file under the sun).
This patch
- removes the sched.h from module.h
- Moves the capable() definition from sched.h to capability.h
- split out the wake_up_* stuff to linux/wakeup.h
- Removed sched.h includes from a bunch of drivers that didn't
need it due to the above work.
- Fixes up all the breakage I was able to find under x86.
Fixing other arch's is simple enough, they just need to include sched.h explicity in a few places now (or jiffies.h, or capability.h or wakeup.h))

Quoted 7 lines

I've not done any measurements to see if this is noticable on a compile, as I'd expect it to be mostly in the noise anyway (though last time I did this in 2.5.early, it did shave off the best part of a minute off my worst-case-scenario build), but untangling the spaghetti of includes a little should at least mean gcc uses less memory during the build.
comments?

Hey, it's includes cleanup time again?
I've postponed my work in late 2.5 for 2.7, but with the new development model it seems we are asked to destabilize 2.6 instead ;-)

Patch looks good to me, I also had a patch waiting to move capable() to where it belongs. So I went to the attic and started my kludgy old scripts on your updated patch. I really should try to dust them of and understand them again...

Some driver fixups to it that look valid at a short first glance are below.

Tim

drivers/char/efirtc.c +1 -0

@@ -36,6 +36,7 @@
 #include <linux/rtc.h>
 #include <linux/proc_fs.h>
 #include <linux/efi.h>
+#include <linux/capability.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>

drivers/char/watchdog/shwdt.c +2 -0

@@ -28,6 +28,8 @@
 #include <linux/notifier.h>
 #include <linux/ioport.h>
 #include <linux/fs.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

drivers/input/gameport/gameport.c +1 -0

@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/stddef.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Generic gameport layer");

drivers/macintosh/ans-lcd.c +1 -0

@@ -9,6 +9,7 @@
 #include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/sections.h>
 #include <asm/prom.h>

drivers/media/dvb/frontends/dst.c +1 -0

@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <asm/div64.h>
 
 #include "dvb_frontend.h"

drivers/media/dvb/frontends/grundig_29504-491.c +1 -0

@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 
 #include "dvb_frontend.h"
 #include "dvb_functions.h"

drivers/media/dvb/frontends/stv0299.c +1 -0

@@ -50,6 +50,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 #include <asm/div64.h>
 
 #include "dvb_frontend.h"

drivers/media/dvb/frontends/tda1004x.c +1 -0

@@ -42,6 +42,7 @@
 #include <linux/fcntl.h>
 #include <linux/errno.h>
 #include <linux/syscalls.h>
+#include <linux/jiffies.h>
 
 #include "dvb_frontend.h"
 #include "dvb_functions.h"