includes cleanup.

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* includes cleanup.
@ 2004-08-19 14:39 Dave Jones
  2004-08-19 14:49 ` Christoph Hellwig
                   ` (2 more replies)
  0 siblings, 3 replies; 16+ messages in thread
From: Dave Jones @ 2004-08-19 14:39 UTC (permalink / raw)
  To: Linux Kernel; +Cc: Rusty Russell

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 davej@redhat.com 
#   [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 <davej@redhat.com>
# 
diff -Nru a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-08-14 22:18:22 +01:00
+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-08-14 22:18:22 +01:00
@@ -28,6 +28,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/cpumask.h>
+#include <linux/sched.h>	/* current / set_cpus_allowed() */
 
 #include <asm/processor.h> 
 #include <asm/msr.h>
diff -Nru a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2004-08-14 22:18:22 +01:00
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2004-08-14 22:18:22 +01:00
@@ -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>
diff -Nru a/arch/i386/kernel/cpu/mtrr/if.c b/arch/i386/kernel/cpu/mtrr/if.c
--- a/arch/i386/kernel/cpu/mtrr/if.c	2004-08-14 22:18:22 +01:00
+++ b/arch/i386/kernel/cpu/mtrr/if.c	2004-08-14 22:18:22 +01:00
@@ -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
diff -Nru a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
--- a/drivers/block/paride/paride.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/block/paride/paride.c	2004-08-14 22:18:22 +01:00
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/sched.h>	/* TASK_* */
 
 #ifdef CONFIG_PARPORT_MODULE
 #define CONFIG_PARPORT
diff -Nru a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
--- a/drivers/block/paride/pg.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/block/paride/pg.c	2004-08-14 22:18:22 +01:00
@@ -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>
 
diff -Nru a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
--- a/drivers/block/paride/pt.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/block/paride/pt.c	2004-08-14 22:18:22 +01:00
@@ -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>
 
diff -Nru a/drivers/char/i8k.c b/drivers/char/i8k.c
--- a/drivers/char/i8k.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/char/i8k.c	2004-08-14 22:18:22 +01:00
@@ -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>
 
diff -Nru a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
--- a/drivers/char/watchdog/cpu5wdt.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/char/watchdog/cpu5wdt.c	2004-08-14 22:18:22 +01:00
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
diff -Nru a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
--- a/drivers/char/watchdog/mixcomwd.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/char/watchdog/mixcomwd.c	2004-08-14 22:18:22 +01:00
@@ -45,6 +45,8 @@
 #include <linux/fs.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff -Nru a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
--- a/drivers/char/watchdog/pcwd.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/char/watchdog/pcwd.c	2004-08-14 22:18:22 +01:00
@@ -66,7 +66,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/reboot.h>
-
+#include <linux/sched.h>	/* TASK_INTERRUPTIBLE, set_current_state() and friends */
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff -Nru a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
--- a/drivers/char/watchdog/sc520_wdt.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/char/watchdog/sc520_wdt.c	2004-08-14 22:18:22 +01:00
@@ -63,6 +63,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff -Nru a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
--- a/drivers/char/watchdog/softdog.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/char/watchdog/softdog.c	2004-08-14 22:18:22 +01:00
@@ -47,6 +47,8 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+
 #include <asm/uaccess.h>
 
 #define PFX "SoftDog: "
diff -Nru a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
--- a/drivers/input/joystick/a3d.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/a3d.c	2004-08-14 22:18:22 +01:00
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("FP-Gaming Assasin 3D joystick driver");
diff -Nru a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
--- a/drivers/input/joystick/adi.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/adi.c	2004-08-14 22:18:22 +01:00
@@ -36,6 +36,7 @@
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Logitech ADI joystick family driver");
diff -Nru a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
--- a/drivers/input/joystick/analog.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/analog.c	2004-08-14 22:18:22 +01:00
@@ -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 <vojtech@ucw.cz>");
diff -Nru a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
--- a/drivers/input/joystick/cobra.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/cobra.c	2004-08-14 22:18:22 +01:00
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Creative Labs Blaster GamePad Cobra driver");
diff -Nru a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
--- a/drivers/input/joystick/gf2k.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/gf2k.c	2004-08-14 22:18:22 +01:00
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Genius Flight 2000 joystick driver");
diff -Nru a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
--- a/drivers/input/joystick/grip.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/grip.c	2004-08-14 22:18:22 +01:00
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Gravis GrIP protocol joystick driver");
diff -Nru a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
--- a/drivers/input/joystick/grip_mp.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/grip_mp.c	2004-08-14 22:18:22 +01:00
@@ -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");
diff -Nru a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
--- a/drivers/input/joystick/guillemot.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/guillemot.c	2004-08-14 22:18:22 +01:00
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Guillemot Digital joystick driver");
diff -Nru a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
--- a/drivers/input/joystick/interact.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/interact.c	2004-08-14 22:18:22 +01:00
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("InterAct digital joystick driver");
diff -Nru a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
--- a/drivers/input/joystick/sidewinder.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/sidewinder.c	2004-08-14 22:18:22 +01:00
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Microsoft SideWinder joystick family driver");
diff -Nru a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
--- a/drivers/input/joystick/tmdc.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/input/joystick/tmdc.c	2004-08-14 22:18:22 +01:00
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("ThrustMaster DirectConnect joystick driver");
diff -Nru a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
--- a/drivers/isdn/capi/capifs.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/isdn/capi/capifs.c	2004-08-14 22:18:22 +01:00
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/ctype.h>
+#include <linux/sched.h>	/* current */
 
 MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem");
 MODULE_AUTHOR("Carsten Paeth");
diff -Nru a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
--- a/drivers/media/radio/miropcm20-rds.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/media/radio/miropcm20-rds.c	2004-08-14 22:18:22 +01:00
@@ -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"
 
diff -Nru a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
--- a/drivers/mtd/mtdblock.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/mtd/mtdblock.c	2004-08-14 22:18:22 +01:00
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/sched.h>	/* TASK_* */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/blktrans.h>
 
diff -Nru a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
--- a/drivers/mtd/mtdchar.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/mtd/mtdchar.c	2004-08-14 22:18:22 +01:00
@@ -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
diff -Nru a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
--- a/drivers/mtd/mtdconcat.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/mtd/mtdconcat.c	2004-08-14 22:18:22 +01:00
@@ -14,7 +14,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-
+#include <linux/sched.h>	/* TASK_* */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/concat.h>
 
diff -Nru a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
--- a/drivers/w1/w1_family.c	2004-08-14 22:18:22 +01:00
+++ b/drivers/w1/w1_family.c	2004-08-14 22:18:22 +01:00
@@ -21,6 +21,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>	/* schedule_timeout() */
 
 #include "w1_family.h"
 
diff -Nru a/fs/filesystems.c b/fs/filesystems.c
--- a/fs/filesystems.c	2004-08-14 22:18:22 +01:00
+++ b/fs/filesystems.c	2004-08-14 22:18:22 +01:00
@@ -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>
 
 /*
diff -Nru a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
--- a/fs/jffs2/wbuf.c	2004-08-14 22:18:22 +01:00
+++ b/fs/jffs2/wbuf.c	2004-08-14 22:18:22 +01:00
@@ -18,6 +18,8 @@
 #include <linux/mtd/mtd.h>
 #include <linux/crc32.h>
 #include <linux/mtd/nand.h>
+#include <linux/jiffies.h>
+
 #include "nodelist.h"
 
 /* For testing write failures */
diff -Nru a/include/linux/capability.h b/include/linux/capability.h
--- a/include/linux/capability.h	2004-08-14 22:18:22 +01:00
+++ b/include/linux/capability.h	2004-08-14 22:18:22 +01:00
@@ -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 */
+
diff -Nru a/include/linux/i2c.h b/include/linux/i2c.h
--- a/include/linux/i2c.h	2004-08-14 22:18:22 +01:00
+++ b/include/linux/i2c.h	2004-08-14 22:18:22 +01:00
@@ -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 ------------------------------------------------	*/
diff -Nru a/include/linux/module.h b/include/linux/module.h
--- a/include/linux/module.h	2004-08-14 22:18:22 +01:00
+++ b/include/linux/module.h	2004-08-14 22:18:22 +01:00
@@ -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 */
diff -Nru a/include/linux/sched.h b/include/linux/sched.h
--- a/include/linux/sched.h	2004-08-14 22:18:22 +01:00
+++ b/include/linux/sched.h	2004-08-14 22:18:22 +01:00
@@ -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
diff -Nru a/include/linux/wakeup.h b/include/linux/wakeup.h
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/include/linux/wakeup.h	2004-08-14 22:18:22 +01:00
@@ -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
diff -Nru a/kernel/kallsyms.c b/kernel/kallsyms.c
--- a/kernel/kallsyms.c	2004-08-14 22:18:22 +01:00
+++ b/kernel/kallsyms.c	2004-08-14 22:18:22 +01:00
@@ -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));
diff -Nru a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c
--- a/sound/oss/ac97_codec.c	2004-08-14 22:18:22 +01:00
+++ b/sound/oss/ac97_codec.c	2004-08-14 22:18:22 +01:00
@@ -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
 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: includes cleanup.
  2004-08-19 14:39 includes cleanup Dave Jones
@ 2004-08-19 14:49 ` Christoph Hellwig
  2004-08-19 14:54   ` Dave Jones
  2004-08-19 16:50   ` Dave Jones
  2004-08-19 15:06 ` William Lee Irwin III
  2004-08-20 15:05 ` includes cleanup Tim Schmielau
  2 siblings, 2 replies; 16+ messages in thread
From: Christoph Hellwig @ 2004-08-19 14:49 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Thu, Aug 19, 2004 at 03:39:07PM +0100, Dave Jones wrote:
> - 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..


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: includes cleanup.
  2004-08-19 14:49 ` Christoph Hellwig
@ 2004-08-19 14:54   ` Dave Jones
  2004-08-19 16:50   ` Dave Jones
  1 sibling, 0 replies; 16+ messages in thread
From: Dave Jones @ 2004-08-19 14:54 UTC (permalink / raw)
  To: Christoph Hellwig, Linux Kernel, Rusty Russell

On Thu, Aug 19, 2004 at 03:49:00PM +0100, Christoph Hellwig wrote:
 > On Thu, Aug 19, 2004 at 03:39:07PM +0100, Dave Jones wrote:
 > > - 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


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: includes cleanup.
  2004-08-19 14:39 includes cleanup Dave Jones
  2004-08-19 14:49 ` Christoph Hellwig
@ 2004-08-19 15:06 ` William Lee Irwin III
  2004-08-25 18:01   ` [1/2] convert linux/user.h users to asm/user.h William Lee Irwin III
  2004-08-20 15:05 ` includes cleanup Tim Schmielau
  2 siblings, 1 reply; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-19 15:06 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Thu, Aug 19, 2004 at 03:39:07PM +0100, Dave Jones wrote:
> 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...]
> 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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: includes cleanup.
  2004-08-19 14:49 ` Christoph Hellwig
  2004-08-19 14:54   ` Dave Jones
@ 2004-08-19 16:50   ` Dave Jones
  1 sibling, 0 replies; 16+ messages in thread
From: Dave Jones @ 2004-08-19 16:50 UTC (permalink / raw)
  To: Christoph Hellwig, Linux Kernel, Rusty Russell

On Thu, Aug 19, 2004 at 03:49:00PM +0100, Christoph Hellwig wrote:
 > On Thu, Aug 19, 2004 at 03:39:07PM +0100, Dave Jones wrote:
 > > - 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


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
--- bk-linus/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-06-15 15:51:50.000000000 +0100
+++ sched/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	2004-08-19 15:08:22.000000000 +0100
@@ -28,6 +28,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/cpumask.h>
+#include <linux/sched.h>	/* current / set_cpus_allowed() */
 
 #include <asm/processor.h> 
 #include <asm/msr.h>
diff -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
--- bk-linus/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2004-06-15 15:51:50.000000000 +0100
+++ sched/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2004-08-19 15:08:22.000000000 +0100
@@ -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>
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/cpu/mtrr/if.c sched/arch/i386/kernel/cpu/mtrr/if.c
--- bk-linus/arch/i386/kernel/cpu/mtrr/if.c	2004-08-09 13:12:15.000000000 +0100
+++ sched/arch/i386/kernel/cpu/mtrr/if.c	2004-08-19 15:08:22.000000000 +0100
@@ -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
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/block/paride/paride.c sched/drivers/block/paride/paride.c
--- bk-linus/drivers/block/paride/paride.c	2004-07-13 00:00:46.000000000 +0100
+++ sched/drivers/block/paride/paride.c	2004-08-19 15:08:36.000000000 +0100
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/sched.h>	/* TASK_* */
 
 #ifdef CONFIG_PARPORT_MODULE
 #define CONFIG_PARPORT
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/block/paride/pg.c sched/drivers/block/paride/pg.c
--- bk-linus/drivers/block/paride/pg.c	2004-06-04 12:08:32.000000000 +0100
+++ sched/drivers/block/paride/pg.c	2004-08-19 15:08:36.000000000 +0100
@@ -162,6 +162,8 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV,
 #include <linux/mtio.h>
 #include <linux/pg.h>
 #include <linux/device.h>
+#include <linux/sched.h>	/* current, TASK_* */
+#include <linux/jiffies.h>
 
 #include <asm/uaccess.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/block/paride/pt.c sched/drivers/block/paride/pt.c
--- bk-linus/drivers/block/paride/pt.c	2004-06-04 12:08:32.000000000 +0100
+++ sched/drivers/block/paride/pt.c	2004-08-19 15:08:36.000000000 +0100
@@ -146,6 +146,7 @@ static int (*drives[4])[6] = {&drive0, &
 #include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/device.h>
+#include <linux/sched.h>	/* current, TASK_*, schedule_timeout() */
 
 #include <asm/uaccess.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/i8k.c sched/drivers/char/i8k.c
--- bk-linus/drivers/char/i8k.c	2004-06-05 00:00:30.000000000 +0100
+++ sched/drivers/char/i8k.c	2004-08-19 15:08:38.000000000 +0100
@@ -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>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/cpu5wdt.c sched/drivers/char/watchdog/cpu5wdt.c
--- bk-linus/drivers/char/watchdog/cpu5wdt.c	2004-06-19 00:01:32.000000000 +0100
+++ sched/drivers/char/watchdog/cpu5wdt.c	2004-08-19 15:08:39.000000000 +0100
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/mixcomwd.c sched/drivers/char/watchdog/mixcomwd.c
--- bk-linus/drivers/char/watchdog/mixcomwd.c	2004-08-09 13:12:17.000000000 +0100
+++ sched/drivers/char/watchdog/mixcomwd.c	2004-08-19 15:08:39.000000000 +0100
@@ -45,6 +45,8 @@
 #include <linux/fs.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/pcwd.c sched/drivers/char/watchdog/pcwd.c
--- bk-linus/drivers/char/watchdog/pcwd.c	2004-08-09 13:12:17.000000000 +0100
+++ sched/drivers/char/watchdog/pcwd.c	2004-08-19 15:08:39.000000000 +0100
@@ -66,7 +66,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/reboot.h>
-
+#include <linux/sched.h>	/* TASK_INTERRUPTIBLE, set_current_state() and friends */
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/sc520_wdt.c sched/drivers/char/watchdog/sc520_wdt.c
--- bk-linus/drivers/char/watchdog/sc520_wdt.c	2004-08-09 13:12:17.000000000 +0100
+++ sched/drivers/char/watchdog/sc520_wdt.c	2004-08-19 15:08:40.000000000 +0100
@@ -63,6 +63,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/watchdog/softdog.c sched/drivers/char/watchdog/softdog.c
--- bk-linus/drivers/char/watchdog/softdog.c	2004-08-09 13:12:17.000000000 +0100
+++ sched/drivers/char/watchdog/softdog.c	2004-08-19 15:08:40.000000000 +0100
@@ -47,6 +47,8 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+
 #include <asm/uaccess.h>
 
 #define PFX "SoftDog: "
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/a3d.c sched/drivers/input/joystick/a3d.c
--- bk-linus/drivers/input/joystick/a3d.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/a3d.c	2004-08-19 15:08:43.000000000 +0100
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("FP-Gaming Assasin 3D joystick driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/adi.c sched/drivers/input/joystick/adi.c
--- bk-linus/drivers/input/joystick/adi.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/adi.c	2004-08-19 15:08:43.000000000 +0100
@@ -36,6 +36,7 @@
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Logitech ADI joystick family driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/analog.c sched/drivers/input/joystick/analog.c
--- bk-linus/drivers/input/joystick/analog.c	2004-07-28 00:02:33.000000000 +0100
+++ sched/drivers/input/joystick/analog.c	2004-08-19 15:08:43.000000000 +0100
@@ -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 <vojtech@ucw.cz>");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/cobra.c sched/drivers/input/joystick/cobra.c
--- bk-linus/drivers/input/joystick/cobra.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/cobra.c	2004-08-19 15:08:43.000000000 +0100
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Creative Labs Blaster GamePad Cobra driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/gf2k.c sched/drivers/input/joystick/gf2k.c
--- bk-linus/drivers/input/joystick/gf2k.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/gf2k.c	2004-08-19 15:08:43.000000000 +0100
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Genius Flight 2000 joystick driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/grip.c sched/drivers/input/joystick/grip.c
--- bk-linus/drivers/input/joystick/grip.c	2004-07-13 00:00:46.000000000 +0100
+++ sched/drivers/input/joystick/grip.c	2004-08-19 15:08:43.000000000 +0100
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Gravis GrIP protocol joystick driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/grip_mp.c sched/drivers/input/joystick/grip_mp.c
--- bk-linus/drivers/input/joystick/grip_mp.c	2004-07-13 00:00:46.000000000 +0100
+++ sched/drivers/input/joystick/grip_mp.c	2004-08-19 15:08:43.000000000 +0100
@@ -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");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/guillemot.c sched/drivers/input/joystick/guillemot.c
--- bk-linus/drivers/input/joystick/guillemot.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/guillemot.c	2004-08-19 15:08:43.000000000 +0100
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Guillemot Digital joystick driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/interact.c sched/drivers/input/joystick/interact.c
--- bk-linus/drivers/input/joystick/interact.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/interact.c	2004-08-19 15:08:43.000000000 +0100
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("InterAct digital joystick driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/sidewinder.c sched/drivers/input/joystick/sidewinder.c
--- bk-linus/drivers/input/joystick/sidewinder.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/sidewinder.c	2004-08-19 15:08:43.000000000 +0100
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Microsoft SideWinder joystick family driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/input/joystick/tmdc.c sched/drivers/input/joystick/tmdc.c
--- bk-linus/drivers/input/joystick/tmdc.c	2004-06-07 21:13:15.000000000 +0100
+++ sched/drivers/input/joystick/tmdc.c	2004-08-19 15:08:43.000000000 +0100
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("ThrustMaster DirectConnect joystick driver");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/isdn/capi/capifs.c sched/drivers/isdn/capi/capifs.c
--- bk-linus/drivers/isdn/capi/capifs.c	2004-06-03 13:39:56.000000000 +0100
+++ sched/drivers/isdn/capi/capifs.c	2004-08-19 15:08:44.000000000 +0100
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/ctype.h>
+#include <linux/sched.h>	/* current */
 
 MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem");
 MODULE_AUTHOR("Carsten Paeth");
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/media/radio/miropcm20-rds.c sched/drivers/media/radio/miropcm20-rds.c
--- bk-linus/drivers/media/radio/miropcm20-rds.c	2004-07-13 00:00:46.000000000 +0100
+++ sched/drivers/media/radio/miropcm20-rds.c	2004-08-19 15:08:45.000000000 +0100
@@ -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"
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/mtd/mtdblock.c sched/drivers/mtd/mtdblock.c
--- bk-linus/drivers/mtd/mtdblock.c	2004-07-16 00:00:59.000000000 +0100
+++ sched/drivers/mtd/mtdblock.c	2004-08-19 15:08:46.000000000 +0100
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/sched.h>	/* TASK_* */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/blktrans.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/mtd/mtdchar.c sched/drivers/mtd/mtdchar.c
--- bk-linus/drivers/mtd/mtdchar.c	2004-08-12 00:00:26.000000000 +0100
+++ sched/drivers/mtd/mtdchar.c	2004-08-19 15:08:46.000000000 +0100
@@ -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
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/mtd/mtdconcat.c sched/drivers/mtd/mtdconcat.c
--- bk-linus/drivers/mtd/mtdconcat.c	2004-07-16 00:00:59.000000000 +0100
+++ sched/drivers/mtd/mtdconcat.c	2004-08-19 15:08:46.000000000 +0100
@@ -14,7 +14,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-
+#include <linux/sched.h>	/* TASK_* */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/concat.h>
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/w1/w1_family.c sched/drivers/w1/w1_family.c
--- bk-linus/drivers/w1/w1_family.c	2004-07-16 00:03:44.000000000 +0100
+++ sched/drivers/w1/w1_family.c	2004-08-19 15:08:55.000000000 +0100
@@ -21,6 +21,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>	/* schedule_timeout() */
 
 #include "w1_family.h"
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/fs/filesystems.c sched/fs/filesystems.c
--- bk-linus/fs/filesystems.c	2004-06-03 13:40:11.000000000 +0100
+++ sched/fs/filesystems.c	2004-08-19 15:08:55.000000000 +0100
@@ -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>
 
 /*
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/fs/jffs2/wbuf.c sched/fs/jffs2/wbuf.c
--- bk-linus/fs/jffs2/wbuf.c	2004-07-16 00:00:59.000000000 +0100
+++ sched/fs/jffs2/wbuf.c	2004-08-19 15:08:56.000000000 +0100
@@ -18,6 +18,8 @@
 #include <linux/mtd/mtd.h>
 #include <linux/crc32.h>
 #include <linux/mtd/nand.h>
+#include <linux/jiffies.h>
+
 #include "nodelist.h"
 
 /* For testing write failures */
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/capability.h sched/include/linux/capability.h
--- bk-linus/include/linux/capability.h	2004-06-03 13:40:23.000000000 +0100
+++ sched/include/linux/capability.h	2004-08-19 15:09:05.000000000 +0100
@@ -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 */
+
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/i2c.h sched/include/linux/i2c.h
--- bk-linus/include/linux/i2c.h	2004-06-03 13:40:24.000000000 +0100
+++ sched/include/linux/i2c.h	2004-08-19 15:09:05.000000000 +0100
@@ -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 ------------------------------------------------	*/
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/module.h sched/include/linux/module.h
--- bk-linus/include/linux/module.h	2004-06-28 00:00:52.000000000 +0100
+++ sched/include/linux/module.h	2004-08-19 16:31:02.000000000 +0100
@@ -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 */
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/sched.h sched/include/linux/sched.h
--- bk-linus/include/linux/sched.h	2004-07-30 22:46:12.000000000 +0100
+++ sched/include/linux/sched.h	2004-08-19 16:31:02.000000000 +0100
@@ -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
  */
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/wait.h sched/include/linux/wait.h
--- bk-linus/include/linux/wait.h	2004-06-25 00:01:14.000000000 +0100
+++ sched/include/linux/wait.h	2004-08-19 16:31:02.000000000 +0100
@@ -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)
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/kernel/kallsyms.c sched/kernel/kallsyms.c
--- bk-linus/kernel/kallsyms.c	2004-07-03 00:00:39.000000000 +0100
+++ sched/kernel/kallsyms.c	2004-08-19 15:09:08.000000000 +0100
@@ -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));
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/ac97_codec.c sched/sound/oss/ac97_codec.c
--- bk-linus/sound/oss/ac97_codec.c	2004-06-03 13:40:30.000000000 +0100
+++ sched/sound/oss/ac97_codec.c	2004-08-19 15:09:13.000000000 +0100
@@ -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
 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: includes cleanup.
  2004-08-19 14:39 includes cleanup Dave Jones
  2004-08-19 14:49 ` Christoph Hellwig
  2004-08-19 15:06 ` William Lee Irwin III
@ 2004-08-20 15:05 ` Tim Schmielau
  2 siblings, 0 replies; 16+ messages in thread
From: Tim Schmielau @ 2004-08-20 15:05 UTC (permalink / raw)
  To: Dave Jones; +Cc: Linux Kernel, Rusty Russell

On Thu, 19 Aug 2004, Dave Jones wrote:

> 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?


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


--- linux-2.6.8.1-sr1/drivers/char/efirtc.c	2004-04-04 05:37:37.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/char/efirtc.c	2004-08-20 16:28:26.000000000 +0200
@@ -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>

--- linux-2.6.8.1-sr1/drivers/char/watchdog/shwdt.c	2004-08-17 21:38:52.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/char/watchdog/shwdt.c	2004-08-20 16:31:40.000000000 +0200
@@ -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>

--- linux-2.6.8.1-sr1/drivers/input/gameport/gameport.c	2004-08-17 00:13:33.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/input/gameport/gameport.c	2004-08-20 16:32:15.000000000 +0200
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/stddef.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Generic gameport layer");

--- linux-2.6.8.1-sr1/drivers/macintosh/ans-lcd.c	2004-08-17 21:38:52.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/macintosh/ans-lcd.c	2004-08-20 16:32:47.000000000 +0200
@@ -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>

--- linux-2.6.8.1-sr1/drivers/media/dvb/frontends/dst.c	2004-08-17 00:13:25.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/media/dvb/frontends/dst.c	2004-08-20 16:33:12.000000000 +0200
@@ -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"

--- linux-2.6.8.1-sr1/drivers/media/dvb/frontends/grundig_29504-491.c	2004-08-17 00:13:25.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/media/dvb/frontends/grundig_29504-491.c	2004-08-20 16:33:36.000000000 +0200
@@ -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"

--- linux-2.6.8.1-sr1/drivers/media/dvb/frontends/stv0299.c	2004-08-17 21:38:52.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/media/dvb/frontends/stv0299.c	2004-08-20 16:34:01.000000000 +0200
@@ -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"

--- linux-2.6.8.1-sr1/drivers/media/dvb/frontends/tda1004x.c	2004-08-17 21:38:52.000000000 +0200
+++ linux-2.6.8.1-sr2/drivers/media/dvb/frontends/tda1004x.c	2004-08-20 16:34:29.000000000 +0200
@@ -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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [1/2] convert linux/user.h users to asm/user.h
  2004-08-19 15:06 ` William Lee Irwin III
@ 2004-08-25 18:01   ` William Lee Irwin III
  2004-08-25 18:03     ` [2/2] move user-related stuff to linux/user.h William Lee Irwin III
  2004-08-25 23:56     ` [patch *] remove 450 unnecessary #includes of sched.h Tim Schmielau
  0 siblings, 2 replies; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 18:01 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Thu, Aug 19, 2004 at 03:39:07PM +0100, Dave Jones wrote:
>> 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...]

On Thu, Aug 19, 2004 at 08:06:32AM -0700, William Lee Irwin III wrote:
> 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


Index: mm4-2.6.8.1/arch/alpha/kernel/alpha_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/alpha_ksyms.c	2004-08-25 09:53:58.804142696 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/alpha_ksyms.c	2004-08-25 09:54:39.877898536 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/alpha/kernel/osf_sys.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/osf_sys.c	2004-08-25 09:53:58.816140872 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/osf_sys.c	2004-08-25 09:54:39.878898384 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/alpha/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/process.c	2004-08-25 09:53:58.817140720 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/process.c	2004-08-25 09:54:39.878898384 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/alpha/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/ptrace.c	2004-08-25 09:53:58.817140720 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/ptrace.c	2004-08-25 09:54:39.878898384 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/alpha/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/setup.c	2004-08-25 09:53:58.817140720 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/setup.c	2004-08-25 09:54:39.879898232 -0700
@@ -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>
 
Index: mm4-2.6.8.1/arch/arm/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm/kernel/process.c	2004-08-23 16:10:52.000000000 -0700
+++ mm4-2.6.8.1/arch/arm/kernel/process.c	2004-08-25 09:55:32.414911696 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm/kernel/ptrace.c	2004-08-23 16:11:18.000000000 -0700
+++ mm4-2.6.8.1/arch/arm/kernel/ptrace.c	2004-08-25 09:55:43.379244864 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm26/kernel/armksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm26/kernel/armksyms.c	2004-08-14 03:55:19.000000000 -0700
+++ mm4-2.6.8.1/arch/arm26/kernel/armksyms.c	2004-08-25 09:55:21.754532320 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm26/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm26/kernel/process.c	2004-08-25 09:53:58.817140720 -0700
+++ mm4-2.6.8.1/arch/arm26/kernel/process.c	2004-08-25 09:54:39.879898232 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm26/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm26/kernel/ptrace.c	2004-08-25 09:53:58.817140720 -0700
+++ mm4-2.6.8.1/arch/arm26/kernel/ptrace.c	2004-08-25 09:54:39.879898232 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/cris/arch-v10/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/cris/arch-v10/kernel/ptrace.c	2004-08-25 09:53:58.817140720 -0700
+++ mm4-2.6.8.1/arch/cris/arch-v10/kernel/ptrace.c	2004-08-25 09:54:39.879898232 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/cris/kernel/crisksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/cris/kernel/crisksyms.c	2004-08-14 03:55:48.000000000 -0700
+++ mm4-2.6.8.1/arch/cris/kernel/crisksyms.c	2004-08-25 09:58:33.753344064 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/cris/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/cris/kernel/process.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/cris/kernel/process.c	2004-08-25 09:54:39.880898080 -0700
@@ -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>
 
Index: mm4-2.6.8.1/arch/cris/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/cris/kernel/ptrace.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/cris/kernel/ptrace.c	2004-08-25 09:54:39.880898080 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/h8300/kernel/h8300_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/h8300/kernel/h8300_ksyms.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/h8300/kernel/h8300_ksyms.c	2004-08-25 09:54:39.880898080 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/h8300/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/h8300/kernel/process.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/h8300/kernel/process.c	2004-08-25 09:54:39.880898080 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/h8300/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/h8300/kernel/ptrace.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/h8300/kernel/ptrace.c	2004-08-25 09:54:39.881897928 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/i386/kernel/i386_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/i386/kernel/i386_ksyms.c	2004-08-23 16:10:55.000000000 -0700
+++ mm4-2.6.8.1/arch/i386/kernel/i386_ksyms.c	2004-08-25 09:55:50.992087536 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/i386/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/i386/kernel/process.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/i386/kernel/process.c	2004-08-25 09:54:39.881897928 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/i386/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/i386/kernel/ptrace.c	2004-08-25 09:53:58.818140568 -0700
+++ mm4-2.6.8.1/arch/i386/kernel/ptrace.c	2004-08-25 09:54:39.881897928 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ia64/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/kernel/ptrace.c	2004-08-25 09:53:58.819140416 -0700
+++ mm4-2.6.8.1/arch/ia64/kernel/ptrace.c	2004-08-25 09:54:39.882897776 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68k/kernel/m68k_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68k/kernel/m68k_ksyms.c	2004-08-25 09:53:58.819140416 -0700
+++ mm4-2.6.8.1/arch/m68k/kernel/m68k_ksyms.c	2004-08-25 09:54:39.882897776 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68k/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68k/kernel/process.c	2004-08-25 09:53:58.819140416 -0700
+++ mm4-2.6.8.1/arch/m68k/kernel/process.c	2004-08-25 09:54:39.882897776 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68k/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68k/kernel/ptrace.c	2004-08-25 09:53:58.819140416 -0700
+++ mm4-2.6.8.1/arch/m68k/kernel/ptrace.c	2004-08-25 09:54:39.882897776 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68k/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68k/kernel/traps.c	2004-08-25 09:53:58.819140416 -0700
+++ mm4-2.6.8.1/arch/m68k/kernel/traps.c	2004-08-25 09:54:39.883897624 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68knommu/kernel/m68k_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68knommu/kernel/m68k_ksyms.c	2004-08-25 09:53:58.819140416 -0700
+++ mm4-2.6.8.1/arch/m68knommu/kernel/m68k_ksyms.c	2004-08-25 09:54:39.883897624 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68knommu/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68knommu/kernel/process.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/m68knommu/kernel/process.c	2004-08-25 09:54:39.883897624 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68knommu/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68knommu/kernel/ptrace.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/m68knommu/kernel/ptrace.c	2004-08-25 09:54:39.884897472 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68knommu/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68knommu/kernel/traps.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/m68knommu/kernel/traps.c	2004-08-25 09:54:39.884897472 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/process.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/process.c	2004-08-25 09:54:39.884897472 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/ptrace.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/ptrace.c	2004-08-25 09:54:39.884897472 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/ptrace32.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/ptrace32.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/ptrace32.c	2004-08-25 09:54:39.884897472 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/setup.c	2004-08-25 09:53:58.820140264 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/setup.c	2004-08-25 09:54:39.885897320 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/parisc/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/parisc/kernel/ptrace.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/parisc/kernel/ptrace.c	2004-08-25 09:54:39.885897320 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/kernel/process.c	2004-08-23 16:11:15.000000000 -0700
+++ mm4-2.6.8.1/arch/ppc/kernel/process.c	2004-08-25 09:56:04.811986592 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/kernel/ptrace.c	2004-08-14 03:55:09.000000000 -0700
+++ mm4-2.6.8.1/arch/ppc/kernel/ptrace.c	2004-08-25 09:56:18.574894312 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/kernel/softemu8xx.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/kernel/softemu8xx.c	2004-08-14 03:55:33.000000000 -0700
+++ mm4-2.6.8.1/arch/ppc/kernel/softemu8xx.c	2004-08-25 09:56:31.193975920 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/kernel/traps.c	2004-08-23 16:10:56.000000000 -0700
+++ mm4-2.6.8.1/arch/ppc/kernel/traps.c	2004-08-25 09:56:41.239448776 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/platforms/chrp_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/platforms/chrp_setup.c	2004-08-25 09:53:58.822139960 -0700
+++ mm4-2.6.8.1/arch/ppc/platforms/chrp_setup.c	2004-08-25 09:54:39.885897320 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/platforms/pmac_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/platforms/pmac_setup.c	2004-08-25 09:53:58.822139960 -0700
+++ mm4-2.6.8.1/arch/ppc/platforms/pmac_setup.c	2004-08-25 09:54:39.886897168 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/platforms/prep_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/platforms/prep_setup.c	2004-08-25 09:53:58.822139960 -0700
+++ mm4-2.6.8.1/arch/ppc/platforms/prep_setup.c	2004-08-25 09:54:39.886897168 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/platforms/residual.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/platforms/residual.c	2004-08-25 09:53:58.822139960 -0700
+++ mm4-2.6.8.1/arch/ppc/platforms/residual.c	2004-08-25 09:54:39.886897168 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/syslib/m8260_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/syslib/m8260_setup.c	2004-08-25 09:53:58.822139960 -0700
+++ mm4-2.6.8.1/arch/ppc/syslib/m8260_setup.c	2004-08-25 09:54:39.887897016 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc/syslib/m8xx_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/syslib/m8xx_setup.c	2004-08-25 09:53:58.822139960 -0700
+++ mm4-2.6.8.1/arch/ppc/syslib/m8xx_setup.c	2004-08-25 09:54:39.887897016 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/chrp_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/chrp_setup.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/chrp_setup.c	2004-08-25 09:54:39.887897016 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/pmac_setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/pmac_setup.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/pmac_setup.c	2004-08-25 09:54:39.887897016 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/process.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/process.c	2004-08-25 09:54:39.888896864 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/ptrace.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/ptrace.c	2004-08-25 09:54:39.888896864 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/ptrace32.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/ptrace32.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/ptrace32.c	2004-08-25 09:54:39.888896864 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/traps.c	2004-08-25 09:53:58.821140112 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/traps.c	2004-08-25 09:54:39.888896864 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/s390/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/s390/kernel/process.c	2004-08-25 09:53:58.823139808 -0700
+++ mm4-2.6.8.1/arch/s390/kernel/process.c	2004-08-25 09:54:39.889896712 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/s390/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/s390/kernel/ptrace.c	2004-08-25 09:53:58.823139808 -0700
+++ mm4-2.6.8.1/arch/s390/kernel/ptrace.c	2004-08-25 09:54:39.889896712 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/s390/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/s390/kernel/setup.c	2004-08-25 09:53:58.823139808 -0700
+++ mm4-2.6.8.1/arch/s390/kernel/setup.c	2004-08-25 09:54:39.889896712 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh/kernel/ptrace.c	2004-08-25 09:53:58.823139808 -0700
+++ mm4-2.6.8.1/arch/sh/kernel/ptrace.c	2004-08-25 09:54:39.890896560 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh/kernel/sh_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh/kernel/sh_ksyms.c	2004-08-25 09:53:58.823139808 -0700
+++ mm4-2.6.8.1/arch/sh/kernel/sh_ksyms.c	2004-08-25 09:54:39.890896560 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh64/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh64/kernel/process.c	2004-08-25 09:53:58.823139808 -0700
+++ mm4-2.6.8.1/arch/sh64/kernel/process.c	2004-08-25 09:54:39.890896560 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh64/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh64/kernel/ptrace.c	2004-08-25 09:53:58.824139656 -0700
+++ mm4-2.6.8.1/arch/sh64/kernel/ptrace.c	2004-08-25 09:54:39.890896560 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh64/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh64/kernel/setup.c	2004-08-25 09:53:58.824139656 -0700
+++ mm4-2.6.8.1/arch/sh64/kernel/setup.c	2004-08-25 09:54:39.891896408 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh64/kernel/sh_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh64/kernel/sh_ksyms.c	2004-08-25 09:53:58.824139656 -0700
+++ mm4-2.6.8.1/arch/sh64/kernel/sh_ksyms.c	2004-08-25 09:54:39.891896408 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc/kernel/process.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/sparc/kernel/process.c	2004-08-25 09:54:39.891896408 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc/kernel/ptrace.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/sparc/kernel/ptrace.c	2004-08-25 09:54:39.892896256 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc/kernel/setup.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/sparc/kernel/setup.c	2004-08-25 09:54:39.892896256 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/kernel/binfmt_aout32.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/kernel/binfmt_aout32.c	2004-08-25 09:53:58.824139656 -0700
+++ mm4-2.6.8.1/arch/sparc64/kernel/binfmt_aout32.c	2004-08-25 09:54:39.892896256 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/kernel/process.c	2004-08-23 16:11:15.000000000 -0700
+++ mm4-2.6.8.1/arch/sparc64/kernel/process.c	2004-08-25 09:56:51.115947320 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/kernel/ptrace.c	2004-08-25 09:53:58.824139656 -0700
+++ mm4-2.6.8.1/arch/sparc64/kernel/ptrace.c	2004-08-25 09:54:39.892896256 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/kernel/setup.c	2004-08-25 09:53:58.824139656 -0700
+++ mm4-2.6.8.1/arch/sparc64/kernel/setup.c	2004-08-25 09:54:39.893896104 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/v850/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/v850/kernel/process.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/v850/kernel/process.c	2004-08-25 09:54:39.893896104 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/v850/kernel/v850_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/v850/kernel/v850_ksyms.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/v850/kernel/v850_ksyms.c	2004-08-25 09:54:39.893896104 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/x86_64/ia32/ia32_aout.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/ia32/ia32_aout.c	2004-08-25 09:53:58.826139352 -0700
+++ mm4-2.6.8.1/arch/x86_64/ia32/ia32_aout.c	2004-08-25 09:54:39.893896104 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/x86_64/ia32/tls32.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/ia32/tls32.c	2004-08-25 09:53:58.826139352 -0700
+++ mm4-2.6.8.1/arch/x86_64/ia32/tls32.c	2004-08-25 09:54:39.894895952 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/x86_64/kernel/process.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/kernel/process.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/x86_64/kernel/process.c	2004-08-25 09:54:39.894895952 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/x86_64/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/kernel/ptrace.c	2004-08-25 09:53:58.825139504 -0700
+++ mm4-2.6.8.1/arch/x86_64/kernel/ptrace.c	2004-08-25 09:54:39.894895952 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/x86_64/kernel/setup.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/kernel/setup.c	2004-08-25 09:53:58.826139352 -0700
+++ mm4-2.6.8.1/arch/x86_64/kernel/setup.c	2004-08-25 09:54:39.895895800 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/x86_64/kernel/x8664_ksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/kernel/x8664_ksyms.c	2004-08-25 09:53:58.826139352 -0700
+++ mm4-2.6.8.1/arch/x86_64/kernel/x8664_ksyms.c	2004-08-25 09:54:39.895895800 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/ide/ppc/mpc8xx.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/ide/ppc/mpc8xx.c	2004-08-25 09:53:58.826139352 -0700
+++ mm4-2.6.8.1/drivers/ide/ppc/mpc8xx.c	2004-08-25 09:54:39.895895800 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/binfmt_aout.c
===================================================================
--- mm4-2.6.8.1.orig/fs/binfmt_aout.c	2004-08-25 09:53:58.826139352 -0700
+++ mm4-2.6.8.1/fs/binfmt_aout.c	2004-08-25 09:54:39.895895800 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/binfmt_flat.c
===================================================================
--- mm4-2.6.8.1.orig/fs/binfmt_flat.c	2004-08-25 09:53:58.827139200 -0700
+++ mm4-2.6.8.1/fs/binfmt_flat.c	2004-08-25 09:54:39.896895648 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/proc/kcore.c
===================================================================
--- mm4-2.6.8.1.orig/fs/proc/kcore.c	2004-08-25 09:53:58.827139200 -0700
+++ mm4-2.6.8.1/fs/proc/kcore.c	2004-08-25 09:54:39.896895648 -0700
@@ -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>
Index: mm4-2.6.8.1/include/linux/elfcore.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/elfcore.h	2004-08-25 09:53:58.827139200 -0700
+++ mm4-2.6.8.1/include/linux/elfcore.h	2004-08-25 09:54:39.896895648 -0700
@@ -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
 {
Index: mm4-2.6.8.1/include/linux/user.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/user.h	2004-08-25 09:53:58.827139200 -0700
+++ mm4-2.6.8.1/include/linux/user.h	2004-08-25 09:54:39.896895648 -0700
@@ -1 +1 @@
-#include <asm/user.h>
+#error do not include this header

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [2/2] move user-related stuff to linux/user.h
  2004-08-25 18:01   ` [1/2] convert linux/user.h users to asm/user.h William Lee Irwin III
@ 2004-08-25 18:03     ` William Lee Irwin III
  2004-08-25 19:39       ` [0/4] remove signal.h from sched.h William Lee Irwin III
  2004-08-25 23:56     ` [patch *] remove 450 unnecessary #includes of sched.h Tim Schmielau
  1 sibling, 1 reply; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 18:03 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 11:01:38AM -0700, William Lee Irwin III wrote:
> 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.


Index: mm4-2.6.8.1/include/linux/init_task.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/init_task.h	2004-08-23 16:11:19.000000000 -0700
+++ mm4-2.6.8.1/include/linux/init_task.h	2004-08-25 10:04:12.546839624 -0700
@@ -2,6 +2,7 @@
 #define _LINUX__INIT_TASK_H
 
 #include <linux/file.h>
+#include <linux/user.h>
 #include <asm/resource.h>
 
 #define INIT_FILES \
Index: mm4-2.6.8.1/include/linux/key.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/key.h	2004-08-23 16:11:14.000000000 -0700
+++ mm4-2.6.8.1/include/linux/key.h	2004-08-25 10:04:48.598358960 -0700
@@ -59,6 +59,7 @@
 struct key_owner;
 struct keyring_list;
 struct keyring_name;
+struct user_struct;
 
 /*****************************************************************************/
 /*
Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 09:54:27.149833496 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 10:02:20.833822584 -0700
@@ -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;
Index: mm4-2.6.8.1/include/linux/user.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/user.h	2004-08-25 09:54:39.896895648 -0700
+++ mm4-2.6.8.1/include/linux/user.h	2004-08-25 10:07:11.597619768 -0700
@@ -1 +1,41 @@
-#error do not include this header
+#ifndef _LINUX_USER_H
+#define _LINUX_USER_H
+
+/*
+ * 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;
+};
+
+#define INIT_USER (&root_user)
+extern struct user_struct root_user;
+
+/* per-UID process charging. */
+struct user_struct *find_user(uid_t);
+struct user_struct *alloc_uid(uid_t);
+void free_uid(struct user_struct *);
+void switch_uid(struct user_struct *);
+
+static inline struct user_struct *get_uid(struct user_struct *u)
+{
+	atomic_inc(&u->__count);
+	return u;
+}
+
+#endif /* _LINUX_USER_H */
Index: mm4-2.6.8.1/ipc/mqueue.c
===================================================================
--- mm4-2.6.8.1.orig/ipc/mqueue.c	2004-08-23 16:11:12.000000000 -0700
+++ mm4-2.6.8.1/ipc/mqueue.c	2004-08-25 10:05:14.862366224 -0700
@@ -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"
 
Index: mm4-2.6.8.1/kernel/exit.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/exit.c	2004-08-23 16:11:20.000000000 -0700
+++ mm4-2.6.8.1/kernel/exit.c	2004-08-25 10:05:25.034819776 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/fork.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/fork.c	2004-08-25 09:54:39.834905072 -0700
+++ mm4-2.6.8.1/kernel/fork.c	2004-08-25 10:05:34.743343856 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/signal.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/signal.c	2004-08-23 16:11:19.000000000 -0700
+++ mm4-2.6.8.1/kernel/signal.c	2004-08-25 10:05:46.339580960 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/sys.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/sys.c	2004-08-23 16:11:19.000000000 -0700
+++ mm4-2.6.8.1/kernel/sys.c	2004-08-25 10:05:56.775994384 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/user.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/user.c	2004-08-23 16:11:14.000000000 -0700
+++ mm4-2.6.8.1/kernel/user.c	2004-08-25 10:08:24.277570736 -0700
@@ -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"
Index: mm4-2.6.8.1/mm/mlock.c
===================================================================
--- mm4-2.6.8.1.orig/mm/mlock.c	2004-08-23 16:11:13.000000000 -0700
+++ mm4-2.6.8.1/mm/mlock.c	2004-08-25 10:06:06.915452952 -0700
@@ -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)
Index: mm4-2.6.8.1/security/keys/key.c
===================================================================
--- mm4-2.6.8.1.orig/security/keys/key.c	2004-08-23 16:11:14.000000000 -0700
+++ mm4-2.6.8.1/security/keys/key.c	2004-08-25 10:06:18.519688840 -0700
@@ -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;
Index: mm4-2.6.8.1/security/keys/process_keys.c
===================================================================
--- mm4-2.6.8.1.orig/security/keys/process_keys.c	2004-08-23 16:11:14.000000000 -0700
+++ mm4-2.6.8.1/security/keys/process_keys.c	2004-08-25 10:06:30.147921080 -0700
@@ -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"
 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [0/4] remove signal.h from sched.h
  2004-08-25 18:03     ` [2/2] move user-related stuff to linux/user.h William Lee Irwin III
@ 2004-08-25 19:39       ` William Lee Irwin III
  2004-08-25 19:40         ` [1/4] move sighand_struct to signal.h William Lee Irwin III
  2004-08-25 19:42         ` [1/4] move sigqueue " William Lee Irwin III
  0 siblings, 2 replies; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 19:39 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 11:03:42AM -0700, William Lee Irwin III wrote:
> 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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [1/4] move sighand_struct to signal.h
  2004-08-25 19:39       ` [0/4] remove signal.h from sched.h William Lee Irwin III
@ 2004-08-25 19:40         ` William Lee Irwin III
  2004-08-25 19:42         ` [1/4] move sigqueue " William Lee Irwin III
  1 sibling, 0 replies; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 19:40 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 11:03:42AM -0700, William Lee Irwin III wrote:
>> This patch moves all user bits from linux/sched.h to linux/user.h and
>> sweeps all files fiddling with users.

On Wed, Aug 25, 2004 at 12:39:21PM -0700, William Lee Irwin III wrote:
> 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

Index: mm4-2.6.8.1/arch/ia64/kernel/asm-offsets.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/kernel/asm-offsets.c	2004-08-25 12:14:52.068051248 -0700
+++ mm4-2.6.8.1/arch/ia64/kernel/asm-offsets.c	2004-08-25 12:14:57.689196704 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/irixsig.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/irixsig.c	2004-08-25 12:14:52.068051248 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/irixsig.c	2004-08-25 12:14:57.689196704 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/solaris/signal.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/solaris/signal.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/arch/sparc64/solaris/signal.c	2004-08-25 12:14:57.690196552 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/um/kernel/signal_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/kernel/signal_kern.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/arch/um/kernel/signal_kern.c	2004-08-25 12:14:57.690196552 -0700
@@ -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"
Index: mm4-2.6.8.1/drivers/block/nbd.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/block/nbd.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/drivers/block/nbd.c	2004-08-25 12:14:57.690196552 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/char/ftape/lowlevel/fdc-io.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/ftape/lowlevel/fdc-io.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/drivers/char/ftape/lowlevel/fdc-io.c	2004-08-25 12:14:57.691196400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/media/video/saa5249.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/media/video/saa5249.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/drivers/media/video/saa5249.c	2004-08-25 12:14:57.691196400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/mmc/mmc_queue.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/mmc/mmc_queue.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/drivers/mmc/mmc_queue.c	2004-08-25 12:14:57.691196400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/mtd/mtd_blkdevs.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/mtd/mtd_blkdevs.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/drivers/mtd/mtd_blkdevs.c	2004-08-25 12:14:57.692196248 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/afs/internal.h
===================================================================
--- mm4-2.6.8.1.orig/fs/afs/internal.h	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/fs/afs/internal.h	2004-08-25 12:14:57.692196248 -0700
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/signal.h>
 
 /*
  * debug tracing
Index: mm4-2.6.8.1/fs/exec.c
===================================================================
--- mm4-2.6.8.1.orig/fs/exec.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/fs/exec.c	2004-08-25 12:14:57.692196248 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/jffs/intrep.c
===================================================================
--- mm4-2.6.8.1.orig/fs/jffs/intrep.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/fs/jffs/intrep.c	2004-08-25 12:14:57.693196096 -0700
@@ -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"
Index: mm4-2.6.8.1/fs/jffs2/background.c
===================================================================
--- mm4-2.6.8.1.orig/fs/jffs2/background.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/jffs2/background.c	2004-08-25 12:14:57.694195944 -0700
@@ -16,6 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 #include "nodelist.h"
 
 
Index: mm4-2.6.8.1/fs/lockd/clntproc.c
===================================================================
--- mm4-2.6.8.1.orig/fs/lockd/clntproc.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/lockd/clntproc.c	2004-08-25 12:14:57.694195944 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/lockd/svc.c
===================================================================
--- mm4-2.6.8.1.orig/fs/lockd/svc.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/lockd/svc.c	2004-08-25 12:14:57.694195944 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/proc/task_nommu.c
===================================================================
--- mm4-2.6.8.1.orig/fs/proc/task_nommu.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/proc/task_nommu.c	2004-08-25 12:14:57.694195944 -0700
@@ -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
Index: mm4-2.6.8.1/fs/reiser4/entd.c
===================================================================
--- mm4-2.6.8.1.orig/fs/reiser4/entd.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/reiser4/entd.c	2004-08-25 12:14:57.695195792 -0700
@@ -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);
 
Index: mm4-2.6.8.1/fs/reiser4/ktxnmgrd.c
===================================================================
--- mm4-2.6.8.1.orig/fs/reiser4/ktxnmgrd.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/reiser4/ktxnmgrd.c	2004-08-25 12:14:57.695195792 -0700
@@ -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);
 
Index: mm4-2.6.8.1/fs/reiser4/repacker.c
===================================================================
--- mm4-2.6.8.1.orig/fs/reiser4/repacker.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/reiser4/repacker.c	2004-08-25 12:14:57.695195792 -0700
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/writeback.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <asm/atomic.h>
 
Index: mm4-2.6.8.1/include/linux/init_task.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/init_task.h	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/include/linux/init_task.h	2004-08-25 12:14:57.695195792 -0700
@@ -3,6 +3,7 @@
 
 #include <linux/file.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 #include <asm/resource.h>
 
 #define INIT_FILES \
Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 12:14:57.696195640 -0700
@@ -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);
Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/signal.h	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/include/linux/signal.h	2004-08-25 12:15:39.695810728 -0700
@@ -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 *);
Index: mm4-2.6.8.1/kernel/exit.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/exit.c	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/kernel/exit.c	2004-08-25 12:14:57.697195488 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/kmod.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/kmod.c	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/kernel/kmod.c	2004-08-25 12:14:57.697195488 -0700
@@ -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;
Index: mm4-2.6.8.1/kernel/kthread.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/kthread.c	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/kernel/kthread.c	2004-08-25 12:14:57.697195488 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/power/process.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/power/process.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/kernel/power/process.c	2004-08-25 12:14:57.697195488 -0700
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 /* 
  * Timeout for stopping processes
Index: mm4-2.6.8.1/kernel/sys.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/sys.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/kernel/sys.c	2004-08-25 12:14:57.698195336 -0700
@@ -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>
Index: mm4-2.6.8.1/net/ipv4/ipvs/ip_vs_sync.c
===================================================================
--- mm4-2.6.8.1.orig/net/ipv4/ipvs/ip_vs_sync.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/net/ipv4/ipvs/ip_vs_sync.c	2004-08-25 12:14:57.698195336 -0700
@@ -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>
Index: mm4-2.6.8.1/net/rxrpc/internal.h
===================================================================
--- mm4-2.6.8.1.orig/net/rxrpc/internal.h	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/net/rxrpc/internal.h	2004-08-25 12:14:57.698195336 -0700
@@ -8,6 +8,7 @@
 
 #include <linux/compiler.h>
 #include <linux/kernel.h>
+#include <linux/signal.h>
 
 /*
  * debug accounting
Index: mm4-2.6.8.1/net/sunrpc/clnt.c
===================================================================
--- mm4-2.6.8.1.orig/net/sunrpc/clnt.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/net/sunrpc/clnt.c	2004-08-25 12:14:57.699195184 -0700
@@ -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>
Index: mm4-2.6.8.1/net/sunrpc/sched.c
===================================================================
--- mm4-2.6.8.1.orig/net/sunrpc/sched.c	2004-08-25 12:14:52.074050336 -0700
+++ mm4-2.6.8.1/net/sunrpc/sched.c	2004-08-25 12:14:57.699195184 -0700
@@ -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>
Index: mm4-2.6.8.1/net/sunrpc/svc.c
===================================================================
--- mm4-2.6.8.1.orig/net/sunrpc/svc.c	2004-08-25 12:14:52.074050336 -0700
+++ mm4-2.6.8.1/net/sunrpc/svc.c	2004-08-25 12:14:57.699195184 -0700
@@ -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>
Index: mm4-2.6.8.1/security/selinux/hooks.c
===================================================================
--- mm4-2.6.8.1.orig/security/selinux/hooks.c	2004-08-25 12:14:52.074050336 -0700
+++ mm4-2.6.8.1/security/selinux/hooks.c	2004-08-25 12:14:57.701194880 -0700
@@ -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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [1/4] move sigqueue to signal.h
  2004-08-25 19:39       ` [0/4] remove signal.h from sched.h William Lee Irwin III
  2004-08-25 19:40         ` [1/4] move sighand_struct to signal.h William Lee Irwin III
@ 2004-08-25 19:42         ` William Lee Irwin III
  2004-08-25 19:43           ` [2/4] move sigpending to sched.h William Lee Irwin III
  1 sibling, 1 reply; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 19:42 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 12:39:21PM -0700, William Lee Irwin III wrote:
> 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

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 11:06:48.162899200 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 11:11:27.993358504 -0700
@@ -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);
 
Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/signal.h	2004-08-25 11:06:48.149901176 -0700
+++ mm4-2.6.8.1/include/linux/signal.h	2004-08-25 11:13:45.762414424 -0700
@@ -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;
Index: mm4-2.6.8.1/kernel/posix-timers.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/posix-timers.c	2004-08-25 11:06:48.175897224 -0700
+++ mm4-2.6.8.1/kernel/posix-timers.c	2004-08-25 11:12:37.178840712 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/signal.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/signal.c	2004-08-25 11:06:48.176897072 -0700
+++ mm4-2.6.8.1/kernel/signal.c	2004-08-25 11:12:49.517964880 -0700
@@ -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>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [2/4] move sigpending to sched.h
  2004-08-25 19:42         ` [1/4] move sigqueue " William Lee Irwin III
@ 2004-08-25 19:43           ` William Lee Irwin III
  2004-08-25 19:44             ` [3/4] move sighand to signal.h William Lee Irwin III
  0 siblings, 1 reply; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 19:43 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 12:39:21PM -0700, William Lee Irwin III wrote:
>> This series removes the dependency of sched.h on signal.h
>> Atop the just-posted user bits atop 2.6.8.1-mm4.

On Wed, Aug 25, 2004 at 12:42:07PM -0700, William Lee Irwin III wrote:
> 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

Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 11:11:27.993358504 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 11:43:53.764556320 -0700
@@ -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
Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/signal.h	2004-08-25 11:13:45.762414424 -0700
+++ mm4-2.6.8.1/include/linux/signal.h	2004-08-25 11:44:18.280829280 -0700
@@ -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.
  */

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [3/4] move sighand to signal.h
  2004-08-25 19:43           ` [2/4] move sigpending to sched.h William Lee Irwin III
@ 2004-08-25 19:44             ` William Lee Irwin III
  2004-08-25 19:45               ` [4/4] move signal_struct " William Lee Irwin III
  0 siblings, 1 reply; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 19:44 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 12:42:07PM -0700, William Lee Irwin III wrote:
>> Sorry, this is the real 1/4.
>> Move sigqueue-related bits to include/linux/signal.h

On Wed, Aug 25, 2004 at 12:43:04PM -0700, William Lee Irwin III wrote:
> Move sigpending -related bits to include/linux/sched.h

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

Index: mm4-2.6.8.1/arch/ia64/kernel/asm-offsets.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/kernel/asm-offsets.c	2004-08-25 12:14:52.068051248 -0700
+++ mm4-2.6.8.1/arch/ia64/kernel/asm-offsets.c	2004-08-25 12:14:57.689196704 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/irixsig.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/irixsig.c	2004-08-25 12:14:52.068051248 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/irixsig.c	2004-08-25 12:14:57.689196704 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/solaris/signal.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/solaris/signal.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/arch/sparc64/solaris/signal.c	2004-08-25 12:14:57.690196552 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/um/kernel/signal_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/kernel/signal_kern.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/arch/um/kernel/signal_kern.c	2004-08-25 12:14:57.690196552 -0700
@@ -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"
Index: mm4-2.6.8.1/drivers/block/nbd.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/block/nbd.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/drivers/block/nbd.c	2004-08-25 12:14:57.690196552 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/char/ftape/lowlevel/fdc-io.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/ftape/lowlevel/fdc-io.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/drivers/char/ftape/lowlevel/fdc-io.c	2004-08-25 12:14:57.691196400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/media/video/saa5249.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/media/video/saa5249.c	2004-08-25 12:14:52.069051096 -0700
+++ mm4-2.6.8.1/drivers/media/video/saa5249.c	2004-08-25 12:14:57.691196400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/mmc/mmc_queue.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/mmc/mmc_queue.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/drivers/mmc/mmc_queue.c	2004-08-25 12:14:57.691196400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/mtd/mtd_blkdevs.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/mtd/mtd_blkdevs.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/drivers/mtd/mtd_blkdevs.c	2004-08-25 12:14:57.692196248 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/afs/internal.h
===================================================================
--- mm4-2.6.8.1.orig/fs/afs/internal.h	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/fs/afs/internal.h	2004-08-25 12:14:57.692196248 -0700
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include <linux/signal.h>
 
 /*
  * debug tracing
Index: mm4-2.6.8.1/fs/exec.c
===================================================================
--- mm4-2.6.8.1.orig/fs/exec.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/fs/exec.c	2004-08-25 12:14:57.692196248 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/jffs/intrep.c
===================================================================
--- mm4-2.6.8.1.orig/fs/jffs/intrep.c	2004-08-25 12:14:52.070050944 -0700
+++ mm4-2.6.8.1/fs/jffs/intrep.c	2004-08-25 12:14:57.693196096 -0700
@@ -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"
Index: mm4-2.6.8.1/fs/jffs2/background.c
===================================================================
--- mm4-2.6.8.1.orig/fs/jffs2/background.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/jffs2/background.c	2004-08-25 12:14:57.694195944 -0700
@@ -16,6 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 #include "nodelist.h"
 
 
Index: mm4-2.6.8.1/fs/lockd/clntproc.c
===================================================================
--- mm4-2.6.8.1.orig/fs/lockd/clntproc.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/lockd/clntproc.c	2004-08-25 12:14:57.694195944 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/lockd/svc.c
===================================================================
--- mm4-2.6.8.1.orig/fs/lockd/svc.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/lockd/svc.c	2004-08-25 12:14:57.694195944 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/proc/task_nommu.c
===================================================================
--- mm4-2.6.8.1.orig/fs/proc/task_nommu.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/proc/task_nommu.c	2004-08-25 12:14:57.694195944 -0700
@@ -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
Index: mm4-2.6.8.1/fs/reiser4/entd.c
===================================================================
--- mm4-2.6.8.1.orig/fs/reiser4/entd.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/reiser4/entd.c	2004-08-25 12:14:57.695195792 -0700
@@ -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);
 
Index: mm4-2.6.8.1/fs/reiser4/ktxnmgrd.c
===================================================================
--- mm4-2.6.8.1.orig/fs/reiser4/ktxnmgrd.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/reiser4/ktxnmgrd.c	2004-08-25 12:14:57.695195792 -0700
@@ -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);
 
Index: mm4-2.6.8.1/fs/reiser4/repacker.c
===================================================================
--- mm4-2.6.8.1.orig/fs/reiser4/repacker.c	2004-08-25 12:14:52.071050792 -0700
+++ mm4-2.6.8.1/fs/reiser4/repacker.c	2004-08-25 12:14:57.695195792 -0700
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/writeback.h>
 #include <linux/suspend.h>
+#include <linux/signal.h>
 
 #include <asm/atomic.h>
 
Index: mm4-2.6.8.1/include/linux/init_task.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/init_task.h	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/include/linux/init_task.h	2004-08-25 12:14:57.695195792 -0700
@@ -3,6 +3,7 @@
 
 #include <linux/file.h>
 #include <linux/user.h>
+#include <linux/signal.h>
 #include <asm/resource.h>
 
 #define INIT_FILES \
Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 12:14:57.696195640 -0700
@@ -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);
Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/signal.h	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/include/linux/signal.h	2004-08-25 12:15:39.695810728 -0700
@@ -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 *);
Index: mm4-2.6.8.1/kernel/exit.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/exit.c	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/kernel/exit.c	2004-08-25 12:14:57.697195488 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/kmod.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/kmod.c	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/kernel/kmod.c	2004-08-25 12:14:57.697195488 -0700
@@ -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;
Index: mm4-2.6.8.1/kernel/kthread.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/kthread.c	2004-08-25 12:14:52.072050640 -0700
+++ mm4-2.6.8.1/kernel/kthread.c	2004-08-25 12:14:57.697195488 -0700
@@ -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>
Index: mm4-2.6.8.1/kernel/power/process.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/power/process.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/kernel/power/process.c	2004-08-25 12:14:57.697195488 -0700
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 /* 
  * Timeout for stopping processes
Index: mm4-2.6.8.1/kernel/sys.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/sys.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/kernel/sys.c	2004-08-25 12:14:57.698195336 -0700
@@ -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>
Index: mm4-2.6.8.1/net/ipv4/ipvs/ip_vs_sync.c
===================================================================
--- mm4-2.6.8.1.orig/net/ipv4/ipvs/ip_vs_sync.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/net/ipv4/ipvs/ip_vs_sync.c	2004-08-25 12:14:57.698195336 -0700
@@ -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>
Index: mm4-2.6.8.1/net/rxrpc/internal.h
===================================================================
--- mm4-2.6.8.1.orig/net/rxrpc/internal.h	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/net/rxrpc/internal.h	2004-08-25 12:14:57.698195336 -0700
@@ -8,6 +8,7 @@
 
 #include <linux/compiler.h>
 #include <linux/kernel.h>
+#include <linux/signal.h>
 
 /*
  * debug accounting
Index: mm4-2.6.8.1/net/sunrpc/clnt.c
===================================================================
--- mm4-2.6.8.1.orig/net/sunrpc/clnt.c	2004-08-25 12:14:52.073050488 -0700
+++ mm4-2.6.8.1/net/sunrpc/clnt.c	2004-08-25 12:14:57.699195184 -0700
@@ -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>
Index: mm4-2.6.8.1/net/sunrpc/sched.c
===================================================================
--- mm4-2.6.8.1.orig/net/sunrpc/sched.c	2004-08-25 12:14:52.074050336 -0700
+++ mm4-2.6.8.1/net/sunrpc/sched.c	2004-08-25 12:14:57.699195184 -0700
@@ -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>
Index: mm4-2.6.8.1/net/sunrpc/svc.c
===================================================================
--- mm4-2.6.8.1.orig/net/sunrpc/svc.c	2004-08-25 12:14:52.074050336 -0700
+++ mm4-2.6.8.1/net/sunrpc/svc.c	2004-08-25 12:14:57.699195184 -0700
@@ -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>
Index: mm4-2.6.8.1/security/selinux/hooks.c
===================================================================
--- mm4-2.6.8.1.orig/security/selinux/hooks.c	2004-08-25 12:14:52.074050336 -0700
+++ mm4-2.6.8.1/security/selinux/hooks.c	2004-08-25 12:14:57.701194880 -0700
@@ -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"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [4/4] move signal_struct to signal.h
  2004-08-25 19:44             ` [3/4] move sighand to signal.h William Lee Irwin III
@ 2004-08-25 19:45               ` William Lee Irwin III
  2004-08-25 21:10                 ` [5/4] move most signal functions " William Lee Irwin III
  0 siblings, 1 reply; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 19:45 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 12:43:04PM -0700, William Lee Irwin III wrote:
>> Move sigpending -related bits to include/linux/sched.h

On Wed, Aug 25, 2004 at 12:44:13PM -0700, William Lee Irwin III wrote:
> Move sighand_struct -related bits over to include/linux/signal.h

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

Index: mm4-2.6.8.1/arch/i386/mach-voyager/voyager_thread.c
===================================================================
--- mm4-2.6.8.1.orig/arch/i386/mach-voyager/voyager_thread.c	2004-08-25 12:14:44.620183496 -0700
+++ mm4-2.6.8.1/arch/i386/mach-voyager/voyager_thread.c	2004-08-25 12:16:48.767310264 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ia64/kernel/unaligned.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/kernel/unaligned.c	2004-08-25 12:14:44.620183496 -0700
+++ mm4-2.6.8.1/arch/ia64/kernel/unaligned.c	2004-08-25 12:16:48.767310264 -0700
@@ -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>
 
Index: mm4-2.6.8.1/arch/sparc64/solaris/misc.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/solaris/misc.c	2004-08-25 12:14:44.621183344 -0700
+++ mm4-2.6.8.1/arch/sparc64/solaris/misc.c	2004-08-25 12:16:48.768310112 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/char/vt.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/vt.c	2004-08-25 12:14:44.621183344 -0700
+++ mm4-2.6.8.1/drivers/char/vt.c	2004-08-25 12:16:48.769309960 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/char/vt_ioctl.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/vt_ioctl.c	2004-08-25 11:06:48.178896768 -0700
+++ mm4-2.6.8.1/drivers/char/vt_ioctl.c	2004-08-25 12:21:41.379826400 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/net/slip.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/net/slip.c	2004-08-25 12:14:44.621183344 -0700
+++ mm4-2.6.8.1/drivers/net/slip.c	2004-08-25 12:16:48.769309960 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/s390/char/keyboard.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/s390/char/keyboard.c	2004-08-25 12:14:44.621183344 -0700
+++ mm4-2.6.8.1/drivers/s390/char/keyboard.c	2004-08-25 12:16:48.769309960 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/autofs/autofs_i.h
===================================================================
--- mm4-2.6.8.1.orig/fs/autofs/autofs_i.h	2004-08-25 12:14:44.621183344 -0700
+++ mm4-2.6.8.1/fs/autofs/autofs_i.h	2004-08-25 12:16:48.770309808 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/autofs4/autofs_i.h
===================================================================
--- mm4-2.6.8.1.orig/fs/autofs4/autofs_i.h	2004-08-25 12:14:44.622183192 -0700
+++ mm4-2.6.8.1/fs/autofs4/autofs_i.h	2004-08-25 12:16:48.770309808 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/devfs/base.c
===================================================================
--- mm4-2.6.8.1.orig/fs/devfs/base.c	2004-08-25 11:06:48.173897528 -0700
+++ mm4-2.6.8.1/fs/devfs/base.c	2004-08-25 12:17:17.358963672 -0700
@@ -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>
Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 12:14:57.696195640 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 12:16:48.770309808 -0700
@@ -255,6 +255,7 @@
 extern int mmlist_nr;
 
 struct sighand_struct;
+struct signal_struct;
 
 struct sigpending {
 	struct list_head list;
@@ -262,61 +263,6 @@
 };
 
 /*
- * NOTE! "signal_struct" does not have it's own
- * locking, because a shared signal_struct always
- * implies a shared sighand_struct, so locking
- * sighand_struct is always a proper superset of
- * the locking of signal_struct.
- */
-struct signal_struct {
-	atomic_t		count;
-
-	/* current thread group signal load-balancing target: */
-	task_t			*curr_target;
-
-	/* shared signal handling: */
-	struct sigpending	shared_pending;
-
-	/* thread group exit support */
-	int			group_exit;
-	int			group_exit_code;
-	/* overloaded:
-	 * - notify group_exit_task when ->count is equal to notify_count
-	 * - everyone except group_exit_task is stopped during signal delivery
-	 *   of fatal signals, group_exit_task processes the signal.
-	 */
-	struct task_struct	*group_exit_task;
-	int			notify_count;
-
-	/* thread group stop support, overloads group_exit_code too */
-	int			group_stop_count;
-	/* 1 if group stopped since last SIGCONT, -1 if SIGCONT since report */
-  	int			stop_state;
-
-	/* POSIX.1b Interval Timers */
-	struct list_head posix_timers;
-
-	/* job control IDs */
-	pid_t pgrp;
-	pid_t tty_old_pgrp;
-	pid_t session;
-	/* boolean value for session group leader */
-	int leader;
-
-	struct tty_struct *tty; /* NULL if no tty */
-
-	/*
-	 * Cumulative resource counters for dead threads in the group,
-	 * and for reaped dead child processes forked by this group.
-	 * Live threads maintain their own counters and add to these
-	 * in __exit_signal, except for the group leader.
-	 */
-	unsigned long utime, stime, cutime, cstime;
-	unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
-	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-};
-
-/*
  * Priority of a process goes from 0..MAX_PRIO-1, valid RT
  * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL tasks are
  * in the range MAX_RT_PRIO..MAX_PRIO-1. Priority values
@@ -583,11 +529,6 @@
 	int private_pages_count;
 };
 
-static inline pid_t process_group(struct task_struct *tsk)
-{
-	return tsk->signal->pgrp;
-}
-
 extern void free_task(struct task_struct *tsk);
 extern void __put_task_struct(struct task_struct *tsk);
 #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
@@ -786,7 +727,6 @@
 extern void __exit_signal(struct task_struct *);
 extern void exit_sighand(struct task_struct *);
 extern void __exit_sighand(struct task_struct *);
-extern void exit_itimers(struct signal_struct *);
 
 extern NORET_TYPE void do_group_exit(int);
 
Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/signal.h	2004-08-25 12:15:39.695810728 -0700
+++ mm4-2.6.8.1/include/linux/signal.h	2004-08-25 12:16:48.771309656 -0700
@@ -29,6 +29,61 @@
 	spinlock_t		siglock;
 };
 
+/*
+ * NOTE! "signal_struct" does not have it's own
+ * locking, because a shared signal_struct always
+ * implies a shared sighand_struct, so locking
+ * sighand_struct is always a proper superset of
+ * the locking of signal_struct.
+ */
+struct signal_struct {
+	atomic_t		count;
+
+	/* current thread group signal load-balancing target: */
+	task_t			*curr_target;
+
+	/* shared signal handling: */
+	struct sigpending	shared_pending;
+
+	/* thread group exit support */
+	int			group_exit;
+	int			group_exit_code;
+	/* overloaded:
+	 * - notify group_exit_task when ->count is equal to notify_count
+	 * - everyone except group_exit_task is stopped during signal delivery
+	 *   of fatal signals, group_exit_task processes the signal.
+	 */
+	task_t			*group_exit_task;
+	int			notify_count;
+
+	/* thread group stop support, overloads group_exit_code too */
+	int			group_stop_count;
+	/* 1 if group stopped since last SIGCONT, -1 if SIGCONT since report */
+  	int			stop_state;
+
+	/* POSIX.1b Interval Timers */
+	struct list_head posix_timers;
+
+	/* job control IDs */
+	pid_t pgrp;
+	pid_t tty_old_pgrp;
+	pid_t session;
+	/* boolean value for session group leader */
+	int leader;
+
+	struct tty_struct *tty; /* NULL if no tty */
+
+	/*
+	 * Cumulative resource counters for dead threads in the group,
+	 * and for reaped dead child processes forked by this group.
+	 * Live threads maintain their own counters and add to these
+	 * in __exit_signal, except for the group leader.
+	 */
+	unsigned long utime, stime, cutime, cstime;
+	unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
+	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
+};
+
 /* flags values. */
 #define SIGQUEUE_PREALLOC	1
 
@@ -223,6 +278,11 @@
 	spin_unlock_irqrestore(&task->sighand->siglock, flags);
 	return ret;
 }
+ 
+static inline pid_t process_group(task_t *task)
+{
+	return task->signal->pgrp;
+}
 
 extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 extern long do_sigpending(void __user *, unsigned long);
@@ -231,6 +291,7 @@
 void sigqueue_free(struct sigqueue *);
 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 *);
 
 #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
 struct pt_regs;
Index: mm4-2.6.8.1/kernel/pid.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/pid.c	2004-08-25 11:06:48.176897072 -0700
+++ mm4-2.6.8.1/kernel/pid.c	2004-08-25 12:17:53.753430872 -0700
@@ -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];
Index: mm4-2.6.8.1/net/bridge/netfilter/ebtables.c
===================================================================
--- mm4-2.6.8.1.orig/net/bridge/netfilter/ebtables.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/net/bridge/netfilter/ebtables.c	2004-08-25 12:18:21.632192656 -0700
@@ -17,6 +17,7 @@
 
 /* used for print_string */
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/tty.h>
 
 #include <linux/kmod.h>
Index: mm4-2.6.8.1/net/ipv4/netfilter/ipt_owner.c
===================================================================
--- mm4-2.6.8.1.orig/net/ipv4/netfilter/ipt_owner.c	2004-08-14 03:56:22.000000000 -0700
+++ mm4-2.6.8.1/net/ipv4/netfilter/ipt_owner.c	2004-08-25 12:18:44.863660936 -0700
@@ -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>
Index: mm4-2.6.8.1/net/ipv6/netfilter/ip6t_owner.c
===================================================================
--- mm4-2.6.8.1.orig/net/ipv6/netfilter/ip6t_owner.c	2004-08-14 03:55:59.000000000 -0700
+++ mm4-2.6.8.1/net/ipv6/netfilter/ip6t_owner.c	2004-08-25 12:19:03.440836776 -0700
@@ -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>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [5/4] move most signal functions to signal.h
  2004-08-25 19:45               ` [4/4] move signal_struct " William Lee Irwin III
@ 2004-08-25 21:10                 ` William Lee Irwin III
  0 siblings, 0 replies; 16+ messages in thread
From: William Lee Irwin III @ 2004-08-25 21:10 UTC (permalink / raw)
  To: Dave Jones, Linux Kernel, Rusty Russell

On Wed, Aug 25, 2004 at 12:45:27PM -0700, William Lee Irwin III wrote:
> 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.

Index: mm4-2.6.8.1/arch/alpha/kernel/osf_sys.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/osf_sys.c	2004-08-25 09:54:39.878898384 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/osf_sys.c	2004-08-25 13:25:43.283768224 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/alpha/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/alpha/kernel/traps.c	2004-08-23 16:11:10.000000000 -0700
+++ mm4-2.6.8.1/arch/alpha/kernel/traps.c	2004-08-25 13:25:47.474131192 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm/kernel/apm.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm/kernel/apm.c	2004-08-14 03:56:22.000000000 -0700
+++ mm4-2.6.8.1/arch/arm/kernel/apm.c	2004-08-25 13:25:59.990228456 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm/kernel/armksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm/kernel/armksyms.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/arch/arm/kernel/armksyms.c	2004-08-25 13:26:04.251580632 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm/mm/alignment.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm/mm/alignment.c	2004-08-14 03:54:50.000000000 -0700
+++ mm4-2.6.8.1/arch/arm/mm/alignment.c	2004-08-25 13:26:10.481633520 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/arm26/kernel/armksyms.c
===================================================================
--- mm4-2.6.8.1.orig/arch/arm26/kernel/armksyms.c	2004-08-25 09:55:21.754532320 -0700
+++ mm4-2.6.8.1/arch/arm26/kernel/armksyms.c	2004-08-25 13:25:50.632651024 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/cris/arch-v10/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/cris/arch-v10/kernel/ptrace.c	2004-08-25 09:54:39.879898232 -0700
+++ mm4-2.6.8.1/arch/cris/arch-v10/kernel/ptrace.c	2004-08-25 13:26:13.121232240 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/cris/mm/fault.c
===================================================================
--- mm4-2.6.8.1.orig/arch/cris/mm/fault.c	2004-08-25 11:06:48.162899200 -0700
+++ mm4-2.6.8.1/arch/cris/mm/fault.c	2004-08-25 13:26:18.703383624 -0700
@@ -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 *);
Index: mm4-2.6.8.1/arch/h8300/platform/h8300h/ptrace_h8300h.c
===================================================================
--- mm4-2.6.8.1.orig/arch/h8300/platform/h8300h/ptrace_h8300h.c	2004-08-14 03:55:09.000000000 -0700
+++ mm4-2.6.8.1/arch/h8300/platform/h8300h/ptrace_h8300h.c	2004-08-25 13:26:21.829908320 -0700
@@ -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 */
Index: mm4-2.6.8.1/arch/h8300/platform/h8s/ptrace_h8s.c
===================================================================
--- mm4-2.6.8.1.orig/arch/h8300/platform/h8s/ptrace_h8s.c	2004-08-14 03:54:51.000000000 -0700
+++ mm4-2.6.8.1/arch/h8300/platform/h8s/ptrace_h8s.c	2004-08-25 13:26:24.885443808 -0700
@@ -11,6 +11,7 @@
 
 #include <linux/linkage.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <linux/errno.h>
 #include <asm/ptrace.h>
 
Index: mm4-2.6.8.1/arch/i386/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/i386/kernel/traps.c	2004-08-23 16:11:10.000000000 -0700
+++ mm4-2.6.8.1/arch/i386/kernel/traps.c	2004-08-25 13:26:27.796001336 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ia64/ia32/ia32_support.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/ia32/ia32_support.c	2004-08-23 16:10:53.000000000 -0700
+++ mm4-2.6.8.1/arch/ia64/ia32/ia32_support.c	2004-08-25 13:26:31.034509008 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ia64/ia32/ia32_traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/ia32/ia32_traps.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/arch/ia64/ia32/ia32_traps.c	2004-08-25 13:26:34.050050576 -0700
@@ -11,6 +11,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include "ia32priv.h"
 
Index: mm4-2.6.8.1/arch/ia64/kernel/brl_emu.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/kernel/brl_emu.c	2004-08-14 03:55:59.000000000 -0700
+++ mm4-2.6.8.1/arch/ia64/kernel/brl_emu.c	2004-08-25 13:26:37.040595944 -0700
@@ -9,6 +9,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 
Index: mm4-2.6.8.1/arch/ia64/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/kernel/traps.c	2004-08-23 16:10:56.000000000 -0700
+++ mm4-2.6.8.1/arch/ia64/kernel/traps.c	2004-08-25 13:26:39.944154536 -0700
@@ -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 */
Index: mm4-2.6.8.1/arch/ia64/mm/fault.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ia64/mm/fault.c	2004-08-25 11:06:48.166898592 -0700
+++ mm4-2.6.8.1/arch/ia64/mm/fault.c	2004-08-25 13:26:45.006384960 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68k/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68k/kernel/ptrace.c	2004-08-25 09:54:39.882897776 -0700
+++ mm4-2.6.8.1/arch/m68k/kernel/ptrace.c	2004-08-25 13:26:52.483248304 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68k/mm/fault.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68k/mm/fault.c	2004-08-25 11:06:48.166898592 -0700
+++ mm4-2.6.8.1/arch/m68k/mm/fault.c	2004-08-25 13:26:55.114848240 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/m68knommu/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/m68knommu/kernel/ptrace.c	2004-08-25 09:54:39.884897472 -0700
+++ mm4-2.6.8.1/arch/m68knommu/kernel/ptrace.c	2004-08-25 13:26:57.825436168 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/au1000/db1x00/mirage_ts.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/au1000/db1x00/mirage_ts.c	2004-08-14 03:55:35.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/au1000/db1x00/mirage_ts.c	2004-08-25 13:27:03.519570528 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/kernel/traps.c	2004-08-14 03:55:20.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/kernel/traps.c	2004-08-25 13:27:28.590759128 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/sgi-ip22/ip22-berr.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/sgi-ip22/ip22-berr.c	2004-08-14 03:55:32.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/sgi-ip22/ip22-berr.c	2004-08-25 13:27:31.126373656 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/sgi-ip22/ip22-reset.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/sgi-ip22/ip22-reset.c	2004-08-14 03:56:22.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/sgi-ip22/ip22-reset.c	2004-08-25 13:27:33.804966448 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/sgi-ip27/ip27-berr.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/sgi-ip27/ip27-berr.c	2004-08-14 03:55:09.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/sgi-ip27/ip27-berr.c	2004-08-25 13:27:36.380574896 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/sgi-ip32/ip32-berr.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/sgi-ip32/ip32-berr.c	2004-08-14 03:55:35.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/sgi-ip32/ip32-berr.c	2004-08-25 13:27:38.955183496 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/mips/sgi-ip32/ip32-reset.c
===================================================================
--- mm4-2.6.8.1.orig/arch/mips/sgi-ip32/ip32-reset.c	2004-08-14 03:56:01.000000000 -0700
+++ mm4-2.6.8.1/arch/mips/sgi-ip32/ip32-reset.c	2004-08-25 13:27:41.506795592 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/parisc/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/parisc/kernel/traps.c	2004-08-14 03:56:24.000000000 -0700
+++ mm4-2.6.8.1/arch/parisc/kernel/traps.c	2004-08-25 13:27:44.721306912 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/parisc/kernel/unaligned.c
===================================================================
--- mm4-2.6.8.1.orig/arch/parisc/kernel/unaligned.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/arch/parisc/kernel/unaligned.c	2004-08-25 13:27:50.863373176 -0700
@@ -23,6 +23,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/signal.h>
 
 /* #define DEBUG_UNALIGNED 1 */
 
Index: mm4-2.6.8.1/arch/parisc/math-emu/driver.c
===================================================================
--- mm4-2.6.8.1.orig/arch/parisc/math-emu/driver.c	2004-08-14 03:56:01.000000000 -0700
+++ mm4-2.6.8.1/arch/parisc/math-emu/driver.c	2004-08-25 13:28:07.737807872 -0700
@@ -29,6 +29,7 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 #include "float.h"
 #include "math-emu.h"
 
Index: mm4-2.6.8.1/arch/parisc/mm/fault.c
===================================================================
--- mm4-2.6.8.1.orig/arch/parisc/mm/fault.c	2004-08-25 11:06:48.168898288 -0700
+++ mm4-2.6.8.1/arch/parisc/mm/fault.c	2004-08-25 13:28:11.152288792 -0700
@@ -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>
 
Index: mm4-2.6.8.1/arch/ppc/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc/kernel/traps.c	2004-08-25 09:56:41.239448776 -0700
+++ mm4-2.6.8.1/arch/ppc/kernel/traps.c	2004-08-25 13:28:23.644389704 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/mf.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/mf.c	2004-08-14 03:55:48.000000000 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/mf.c	2004-08-25 13:28:16.230516784 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/ppc64/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/ppc64/kernel/traps.c	2004-08-25 09:54:39.888896864 -0700
+++ mm4-2.6.8.1/arch/ppc64/kernel/traps.c	2004-08-25 13:28:20.533862576 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/s390/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/s390/kernel/traps.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/arch/s390/kernel/traps.c	2004-08-25 13:28:26.650932640 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh/kernel/traps.c	2004-08-14 03:54:48.000000000 -0700
+++ mm4-2.6.8.1/arch/sh/kernel/traps.c	2004-08-25 13:28:34.448747192 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh64/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh64/kernel/ptrace.c	2004-08-25 09:54:39.890896560 -0700
+++ mm4-2.6.8.1/arch/sh64/kernel/ptrace.c	2004-08-25 13:28:30.313375864 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sh64/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sh64/kernel/traps.c	2004-08-14 03:56:00.000000000 -0700
+++ mm4-2.6.8.1/arch/sh64/kernel/traps.c	2004-08-25 13:28:32.473047544 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc/kernel/sys_solaris.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc/kernel/sys_solaris.c	2004-08-14 03:54:52.000000000 -0700
+++ mm4-2.6.8.1/arch/sparc/kernel/sys_solaris.c	2004-08-25 13:28:38.510129768 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc/kernel/sys_sparc.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc/kernel/sys_sparc.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/arch/sparc/kernel/sys_sparc.c	2004-08-25 13:28:40.638806160 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc/kernel/unaligned.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc/kernel/unaligned.c	2004-08-14 03:56:00.000000000 -0700
+++ mm4-2.6.8.1/arch/sparc/kernel/unaligned.c	2004-08-25 13:28:42.717490152 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/sparc64/kernel/sys_sparc.c
===================================================================
--- mm4-2.6.8.1.orig/arch/sparc64/kernel/sys_sparc.c	2004-08-14 03:55:33.000000000 -0700
+++ mm4-2.6.8.1/arch/sparc64/kernel/sys_sparc.c	2004-08-25 13:28:36.527431184 -0700
@@ -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>
Index: mm4-2.6.8.1/arch/um/drivers/line.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/drivers/line.c	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/arch/um/drivers/line.c	2004-08-25 13:28:54.089761304 -0700
@@ -4,6 +4,7 @@
  */
 
 #include "linux/sched.h"
+#include "linux/signal.h"
 #include "linux/slab.h"
 #include "linux/list.h"
 #include "linux/interrupt.h"
Index: mm4-2.6.8.1/arch/um/drivers/port_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/drivers/port_kern.c	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/arch/um/drivers/port_kern.c	2004-08-25 13:29:03.086393608 -0700
@@ -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"
Index: mm4-2.6.8.1/arch/um/drivers/ubd_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/drivers/ubd_kern.c	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/arch/um/drivers/ubd_kern.c	2004-08-25 13:29:10.204311520 -0700
@@ -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"
Index: mm4-2.6.8.1/arch/um/include/kern_util.h
===================================================================
--- mm4-2.6.8.1.orig/arch/um/include/kern_util.h	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/arch/um/include/kern_util.h	2004-08-25 13:29:22.887383400 -0700
@@ -7,6 +7,7 @@
 #define __KERN_UTIL_H__
 
 #include "linux/threads.h"
+#include "linux/signal.h"
 #include "sysdep/ptrace.h"
 
 extern int ncpus;
Index: mm4-2.6.8.1/arch/um/kernel/process_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/kernel/process_kern.c	2004-08-23 16:11:04.000000000 -0700
+++ mm4-2.6.8.1/arch/um/kernel/process_kern.c	2004-08-25 13:29:59.478820656 -0700
@@ -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"
Index: mm4-2.6.8.1/arch/um/kernel/reboot.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/kernel/reboot.c	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/arch/um/kernel/reboot.c	2004-08-25 13:30:02.642339728 -0700
@@ -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"
Index: mm4-2.6.8.1/arch/um/kernel/trap_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/kernel/trap_kern.c	2004-08-23 16:11:04.000000000 -0700
+++ mm4-2.6.8.1/arch/um/kernel/trap_kern.c	2004-08-25 13:30:04.960987240 -0700
@@ -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"
Index: mm4-2.6.8.1/arch/um/kernel/tt/syscall_kern.c
===================================================================
--- mm4-2.6.8.1.orig/arch/um/kernel/tt/syscall_kern.c	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/arch/um/kernel/tt/syscall_kern.c	2004-08-25 13:30:09.039367232 -0700
@@ -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"
Index: mm4-2.6.8.1/arch/v850/kernel/ptrace.c
===================================================================
--- mm4-2.6.8.1.orig/arch/v850/kernel/ptrace.c	2004-08-23 16:11:18.000000000 -0700
+++ mm4-2.6.8.1/arch/v850/kernel/ptrace.c	2004-08-25 13:30:35.294375864 -0700
@@ -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>
 
Index: mm4-2.6.8.1/arch/x86_64/kernel/traps.c
===================================================================
--- mm4-2.6.8.1.orig/arch/x86_64/kernel/traps.c	2004-08-23 16:11:09.000000000 -0700
+++ mm4-2.6.8.1/arch/x86_64/kernel/traps.c	2004-08-25 13:30:38.005963640 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/block/pktcdvd.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/block/pktcdvd.c	2004-08-23 16:11:03.000000000 -0700
+++ mm4-2.6.8.1/drivers/block/pktcdvd.c	2004-08-25 13:30:49.250254248 -0700
@@ -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>
 
Index: mm4-2.6.8.1/drivers/char/drm/drmP.h
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/drm/drmP.h	2004-08-23 16:10:53.000000000 -0700
+++ mm4-2.6.8.1/drivers/char/drm/drmP.h	2004-08-25 13:31:31.690802304 -0700
@@ -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
Index: mm4-2.6.8.1/drivers/char/drm/drm_irq.h
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/drm/drm_irq.h	2004-08-14 03:55:35.000000000 -0700
+++ mm4-2.6.8.1/drivers/char/drm/drm_irq.h	2004-08-25 13:31:15.097324896 -0700
@@ -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
Index: mm4-2.6.8.1/drivers/char/keyboard.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/keyboard.c	2004-08-23 16:10:56.000000000 -0700
+++ mm4-2.6.8.1/drivers/char/keyboard.c	2004-08-25 13:31:46.462556656 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/char/nwbutton.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/nwbutton.c	2004-08-14 03:56:23.000000000 -0700
+++ mm4-2.6.8.1/drivers/char/nwbutton.c	2004-08-25 13:31:50.652919624 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/char/sysrq.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/char/sysrq.c	2004-08-23 16:10:56.000000000 -0700
+++ mm4-2.6.8.1/drivers/char/sysrq.c	2004-08-25 13:31:52.595624288 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/input/serio/serio.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/input/serio/serio.c	2004-08-23 16:10:53.000000000 -0700
+++ mm4-2.6.8.1/drivers/input/serio/serio.c	2004-08-25 13:32:02.368138640 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/macintosh/adb.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/macintosh/adb.c	2004-08-14 03:56:24.000000000 -0700
+++ mm4-2.6.8.1/drivers/macintosh/adb.c	2004-08-25 13:32:04.999738576 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/md/md.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/md/md.c	2004-08-23 16:11:15.000000000 -0700
+++ mm4-2.6.8.1/drivers/md/md.c	2004-08-25 13:32:10.286934800 -0700
@@ -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>
 
Index: mm4-2.6.8.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2004-08-25 13:32:16.236030400 -0700
@@ -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>
 
Index: mm4-2.6.8.1/drivers/media/dvb/dvb-core/dvb_frontend.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/media/dvb/dvb-core/dvb_frontend.c	2004-08-14 03:54:51.000000000 -0700
+++ mm4-2.6.8.1/drivers/media/dvb/dvb-core/dvb_frontend.c	2004-08-25 13:32:19.794489432 -0700
@@ -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>
 
Index: mm4-2.6.8.1/drivers/net/8139too.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/net/8139too.c	2004-08-23 16:11:14.000000000 -0700
+++ mm4-2.6.8.1/drivers/net/8139too.c	2004-08-25 13:32:24.193820632 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/net/eql.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/net/eql.c	2004-08-14 03:56:01.000000000 -0700
+++ mm4-2.6.8.1/drivers/net/eql.c	2004-08-25 13:32:29.567003784 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/net/irda/stir4200.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/net/irda/stir4200.c	2004-08-14 03:54:52.000000000 -0700
+++ mm4-2.6.8.1/drivers/net/irda/stir4200.c	2004-08-25 13:32:33.966334984 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/net/wireless/airo.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/net/wireless/airo.c	2004-08-23 16:11:13.000000000 -0700
+++ mm4-2.6.8.1/drivers/net/wireless/airo.c	2004-08-25 13:32:38.086708592 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/parisc/power.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/parisc/power.c	2004-08-14 03:54:48.000000000 -0700
+++ mm4-2.6.8.1/drivers/parisc/power.c	2004-08-25 13:32:40.819293176 -0700
@@ -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>
 
Index: mm4-2.6.8.1/drivers/perfctr/virtual.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/perfctr/virtual.c	2004-08-23 16:11:00.000000000 -0700
+++ mm4-2.6.8.1/drivers/perfctr/virtual.c	2004-08-25 13:32:44.489735184 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/s390/char/fs3270.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/s390/char/fs3270.c	2004-08-14 03:55:09.000000000 -0700
+++ mm4-2.6.8.1/drivers/s390/char/fs3270.c	2004-08-25 13:32:48.937059088 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/s390/net/qeth_main.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/s390/net/qeth_main.c	2004-08-14 03:55:32.000000000 -0700
+++ mm4-2.6.8.1/drivers/s390/net/qeth_main.c	2004-08-25 13:32:51.514667232 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/s390/s390mach.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/s390/s390mach.c	2004-08-14 03:56:23.000000000 -0700
+++ mm4-2.6.8.1/drivers/s390/s390mach.c	2004-08-25 13:32:53.574354112 -0700
@@ -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>
 
Index: mm4-2.6.8.1/drivers/sbus/char/bbc_envctrl.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/sbus/char/bbc_envctrl.c	2004-08-14 03:56:26.000000000 -0700
+++ mm4-2.6.8.1/drivers/sbus/char/bbc_envctrl.c	2004-08-25 13:32:55.590047680 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/sbus/char/envctrl.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/sbus/char/envctrl.c	2004-08-14 03:54:50.000000000 -0700
+++ mm4-2.6.8.1/drivers/sbus/char/envctrl.c	2004-08-25 13:32:57.701726656 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/scsi/aacraid/linit.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/scsi/aacraid/linit.c	2004-08-23 16:10:54.000000000 -0700
+++ mm4-2.6.8.1/drivers/scsi/aacraid/linit.c	2004-08-25 13:33:03.755806296 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/scsi/cpqfcTSinit.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/scsi/cpqfcTSinit.c	2004-08-23 16:11:13.000000000 -0700
+++ mm4-2.6.8.1/drivers/scsi/cpqfcTSinit.c	2004-08-25 13:33:08.962014832 -0700
@@ -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
Index: mm4-2.6.8.1/drivers/scsi/qla2xxx/qla_os.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/scsi/qla2xxx/qla_os.c	2004-08-23 16:11:08.000000000 -0700
+++ mm4-2.6.8.1/drivers/scsi/qla2xxx/qla_os.c	2004-08-25 13:33:13.905263344 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/usb/core/hub.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/usb/core/hub.c	2004-08-23 16:10:55.000000000 -0700
+++ mm4-2.6.8.1/drivers/usb/core/hub.c	2004-08-25 13:33:16.201914200 -0700
@@ -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>
Index: mm4-2.6.8.1/drivers/usb/core/inode.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/usb/core/inode.c	2004-08-23 16:10:55.000000000 -0700
+++ mm4-2.6.8.1/drivers/usb/core/inode.c	2004-08-25 13:33:20.445269112 -0700
@@ -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;
Index: mm4-2.6.8.1/drivers/w1/w1.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/w1/w1.c	2004-08-23 16:10:54.000000000 -0700
+++ mm4-2.6.8.1/drivers/w1/w1.c	2004-08-25 13:33:22.676929848 -0700
@@ -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"
Index: mm4-2.6.8.1/drivers/w1/w1_int.c
===================================================================
--- mm4-2.6.8.1.orig/drivers/w1/w1_int.c	2004-08-23 16:10:54.000000000 -0700
+++ mm4-2.6.8.1/drivers/w1/w1_int.c	2004-08-25 13:33:25.771459408 -0700
@@ -21,6 +21,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/signal.h>
 
 #include "w1.h"
 #include "w1_log.h"
Index: mm4-2.6.8.1/fs/buffer.c
===================================================================
--- mm4-2.6.8.1.orig/fs/buffer.c	2004-08-23 16:19:32.000000000 -0700
+++ mm4-2.6.8.1/fs/buffer.c	2004-08-25 13:33:33.802238544 -0700
@@ -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);
Index: mm4-2.6.8.1/fs/cifs/cifsfs.c
===================================================================
--- mm4-2.6.8.1.orig/fs/cifs/cifsfs.c	2004-08-23 16:11:17.000000000 -0700
+++ mm4-2.6.8.1/fs/cifs/cifsfs.c	2004-08-25 13:33:42.677889240 -0700
@@ -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
Index: mm4-2.6.8.1/fs/cifs/connect.c
===================================================================
--- mm4-2.6.8.1.orig/fs/cifs/connect.c	2004-08-14 03:56:15.000000000 -0700
+++ mm4-2.6.8.1/fs/cifs/connect.c	2004-08-25 13:33:47.717123160 -0700
@@ -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"
Index: mm4-2.6.8.1/fs/dnotify.c
===================================================================
--- mm4-2.6.8.1.orig/fs/dnotify.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/fs/dnotify.c	2004-08-25 13:33:49.818803656 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/jffs/inode-v23.c
===================================================================
--- mm4-2.6.8.1.orig/fs/jffs/inode-v23.c	2004-08-14 03:55:34.000000000 -0700
+++ mm4-2.6.8.1/fs/jffs/inode-v23.c	2004-08-25 13:33:56.001863688 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/ncpfs/file.c
===================================================================
--- mm4-2.6.8.1.orig/fs/ncpfs/file.c	2004-08-23 16:11:20.000000000 -0700
+++ mm4-2.6.8.1/fs/ncpfs/file.c	2004-08-25 13:33:59.824282592 -0700
@@ -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"
Index: mm4-2.6.8.1/fs/ncpfs/inode.c
===================================================================
--- mm4-2.6.8.1.orig/fs/ncpfs/inode.c	2004-08-23 16:11:17.000000000 -0700
+++ mm4-2.6.8.1/fs/ncpfs/inode.c	2004-08-25 13:34:04.046640696 -0700
@@ -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>
 
Index: mm4-2.6.8.1/fs/nfs/direct.c
===================================================================
--- mm4-2.6.8.1.orig/fs/nfs/direct.c	2004-08-14 03:56:09.000000000 -0700
+++ mm4-2.6.8.1/fs/nfs/direct.c	2004-08-25 13:34:06.301297936 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/nfsd/nfssvc.c
===================================================================
--- mm4-2.6.8.1.orig/fs/nfsd/nfssvc.c	2004-08-14 03:55:33.000000000 -0700
+++ mm4-2.6.8.1/fs/nfsd/nfssvc.c	2004-08-25 13:34:10.132715472 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/pipe.c
===================================================================
--- mm4-2.6.8.1.orig/fs/pipe.c	2004-08-14 03:55:33.000000000 -0700
+++ mm4-2.6.8.1/fs/pipe.c	2004-08-25 13:34:13.907141672 -0700
@@ -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>
 
Index: mm4-2.6.8.1/fs/smbfs/inode.c
===================================================================
--- mm4-2.6.8.1.orig/fs/smbfs/inode.c	2004-08-23 16:11:17.000000000 -0700
+++ mm4-2.6.8.1/fs/smbfs/inode.c	2004-08-25 13:34:23.929618024 -0700
@@ -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>
Index: mm4-2.6.8.1/fs/smbfs/smbiod.c
===================================================================
--- mm4-2.6.8.1.orig/fs/smbfs/smbiod.c	2004-08-14 03:55:35.000000000 -0700
+++ mm4-2.6.8.1/fs/smbfs/smbiod.c	2004-08-25 13:34:25.991304600 -0700
@@ -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>
Index: mm4-2.6.8.1/include/linux/fs.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/fs.h	2004-08-23 16:11:19.000000000 -0700
+++ mm4-2.6.8.1/include/linux/fs.h	2004-08-25 13:34:41.819898288 -0700
@@ -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;
Index: mm4-2.6.8.1/include/linux/sched.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/sched.h	2004-08-25 12:31:14.519695896 -0700
+++ mm4-2.6.8.1/include/linux/sched.h	2004-08-25 13:55:00.045699816 -0700
@@ -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 *);
Index: mm4-2.6.8.1/include/linux/signal.h
===================================================================
--- mm4-2.6.8.1.orig/include/linux/signal.h	2004-08-25 12:31:14.520695744 -0700
+++ mm4-2.6.8.1/include/linux/signal.h	2004-08-25 13:55:18.261930528 -0700
@@ -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;
Index: mm4-2.6.8.1/ipc/mqueue.c
===================================================================
--- mm4-2.6.8.1.orig/ipc/mqueue.c	2004-08-25 10:05:14.862366224 -0700
+++ mm4-2.6.8.1/ipc/mqueue.c	2004-08-25 13:34:52.518271888 -0700
@@ -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"
 
Index: mm4-2.6.8.1/kernel/exec_domain.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/exec_domain.c	2004-08-14 03:55:34.000000000 -0700
+++ mm4-2.6.8.1/kernel/exec_domain.c	2004-08-25 13:34:54.532965608 -0700
@@ -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>
 
Index: mm4-2.6.8.1/kernel/futex.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/futex.c	2004-08-14 03:55:09.000000000 -0700
+++ mm4-2.6.8.1/kernel/futex.c	2004-08-25 13:34:59.139265344 -0700
@@ -39,6 +39,7 @@
 #include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
+#include <linux/signal.h>
 
 #define FUTEX_HASHBITS 8
 
Index: mm4-2.6.8.1/kernel/timer.c
===================================================================
--- mm4-2.6.8.1.orig/kernel/timer.c	2004-08-23 16:11:20.000000000 -0700
+++ mm4-2.6.8.1/kernel/timer.c	2004-08-25 13:35:04.354472512 -0700
@@ -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>
Index: mm4-2.6.8.1/mm/memory.c
===================================================================
--- mm4-2.6.8.1.orig/mm/memory.c	2004-08-23 16:11:10.000000000 -0700
+++ mm4-2.6.8.1/mm/memory.c	2004-08-25 13:35:10.336563096 -0700
@@ -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>
Index: mm4-2.6.8.1/mm/nommu.c
===================================================================
--- mm4-2.6.8.1.orig/mm/nommu.c	2004-08-14 03:56:01.000000000 -0700
+++ mm4-2.6.8.1/mm/nommu.c	2004-08-25 13:35:13.470086728 -0700
@@ -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>
Index: mm4-2.6.8.1/mm/oom_kill.c
===================================================================
--- mm4-2.6.8.1.orig/mm/oom_kill.c	2004-08-23 16:11:01.000000000 -0700
+++ mm4-2.6.8.1/mm/oom_kill.c	2004-08-25 13:35:16.989551688 -0700
@@ -20,6 +20,7 @@
 #include <linux/swap.h>
 #include <linux/timex.h>
 #include <linux/jiffies.h>
+#include <linux/signal.h>
 
 /* #define DEBUG */
 
Index: mm4-2.6.8.1/net/atm/common.c
===================================================================
--- mm4-2.6.8.1.orig/net/atm/common.c	2004-08-14 03:56:25.000000000 -0700
+++ mm4-2.6.8.1/net/atm/common.c	2004-08-25 13:35:20.092080032 -0700
@@ -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>
Index: mm4-2.6.8.1/net/ax25/af_ax25.c
===================================================================
--- mm4-2.6.8.1.orig/net/ax25/af_ax25.c	2004-08-14 03:56:22.000000000 -0700
+++ mm4-2.6.8.1/net/ax25/af_ax25.c	2004-08-25 13:35:22.387731040 -0700
@@ -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>
Index: mm4-2.6.8.1/net/core/sock.c
===================================================================
--- mm4-2.6.8.1.orig/net/core/sock.c	2004-08-14 03:55:48.000000000 -0700
+++ mm4-2.6.8.1/net/core/sock.c	2004-08-25 13:35:24.531405152 -0700
@@ -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>
Index: mm4-2.6.8.1/net/decnet/af_decnet.c
===================================================================
--- mm4-2.6.8.1.orig/net/decnet/af_decnet.c	2004-08-14 03:55:32.000000000 -0700
+++ mm4-2.6.8.1/net/decnet/af_decnet.c	2004-08-25 13:35:26.755067104 -0700
@@ -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>
Index: mm4-2.6.8.1/net/ipv4/tcp_input.c
===================================================================
--- mm4-2.6.8.1.orig/net/ipv4/tcp_input.c	2004-08-14 03:55:48.000000000 -0700
+++ mm4-2.6.8.1/net/ipv4/tcp_input.c	2004-08-25 13:35:33.730006752 -0700
@@ -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;
Index: mm4-2.6.8.1/net/ipv4/tcp_minisocks.c
===================================================================
--- mm4-2.6.8.1.orig/net/ipv4/tcp_minisocks.c	2004-08-14 03:55:48.000000000 -0700
+++ mm4-2.6.8.1/net/ipv4/tcp_minisocks.c	2004-08-25 13:35:37.559424592 -0700
@@ -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>
Index: mm4-2.6.8.1/net/irda/af_irda.c
===================================================================
--- mm4-2.6.8.1.orig/net/irda/af_irda.c	2004-08-14 03:55:10.000000000 -0700
+++ mm4-2.6.8.1/net/irda/af_irda.c	2004-08-25 13:35:42.110732688 -0700
@@ -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>
Index: mm4-2.6.8.1/net/netrom/af_netrom.c
===================================================================
--- mm4-2.6.8.1.orig/net/netrom/af_netrom.c	2004-08-14 03:55:32.000000000 -0700
+++ mm4-2.6.8.1/net/netrom/af_netrom.c	2004-08-25 13:35:44.661344936 -0700
@@ -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>
Index: mm4-2.6.8.1/net/rose/af_rose.c
===================================================================
--- mm4-2.6.8.1.orig/net/rose/af_rose.c	2004-08-14 03:55:32.000000000 -0700
+++ mm4-2.6.8.1/net/rose/af_rose.c	2004-08-25 13:35:46.797020264 -0700
@@ -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>
Index: mm4-2.6.8.1/net/sctp/socket.c
===================================================================
--- mm4-2.6.8.1.orig/net/sctp/socket.c	2004-08-23 16:11:06.000000000 -0700
+++ mm4-2.6.8.1/net/sctp/socket.c	2004-08-25 13:35:51.404319848 -0700
@@ -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>
Index: mm4-2.6.8.1/net/x25/af_x25.c
===================================================================
--- mm4-2.6.8.1.orig/net/x25/af_x25.c	2004-08-14 03:56:22.000000000 -0700
+++ mm4-2.6.8.1/net/x25/af_x25.c	2004-08-25 13:35:53.552993200 -0700
@@ -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>
Index: mm4-2.6.8.1/net/x25/x25_in.c
===================================================================
--- mm4-2.6.8.1.orig/net/x25/x25_in.c	2004-08-14 03:56:23.000000000 -0700
+++ mm4-2.6.8.1/net/x25/x25_in.c	2004-08-25 13:35:59.550081504 -0700
@@ -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>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [patch *] remove 450 unnecessary #includes of sched.h
  2004-08-25 18:01   ` [1/2] convert linux/user.h users to asm/user.h William Lee Irwin III
  2004-08-25 18:03     ` [2/2] move user-related stuff to linux/user.h William Lee Irwin III
@ 2004-08-25 23:56     ` Tim Schmielau
  1 sibling, 0 replies; 16+ messages in thread
From: Tim Schmielau @ 2004-08-25 23:56 UTC (permalink / raw)
  To: William Lee Irwin III; +Cc: Dave Jones, Linux Kernel, Rusty Russell

On Wed, 25 Aug 2004, William Lee Irwin III wrote:

> 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

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2004-08-26  0:01 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-19 14:39 includes cleanup Dave Jones
2004-08-19 14:49 ` Christoph Hellwig
2004-08-19 14:54   ` Dave Jones
2004-08-19 16:50   ` Dave Jones
2004-08-19 15:06 ` William Lee Irwin III
2004-08-25 18:01   ` [1/2] convert linux/user.h users to asm/user.h William Lee Irwin III
2004-08-25 18:03     ` [2/2] move user-related stuff to linux/user.h William Lee Irwin III
2004-08-25 19:39       ` [0/4] remove signal.h from sched.h William Lee Irwin III
2004-08-25 19:40         ` [1/4] move sighand_struct to signal.h William Lee Irwin III
2004-08-25 19:42         ` [1/4] move sigqueue " William Lee Irwin III
2004-08-25 19:43           ` [2/4] move sigpending to sched.h William Lee Irwin III
2004-08-25 19:44             ` [3/4] move sighand to signal.h William Lee Irwin III
2004-08-25 19:45               ` [4/4] move signal_struct " William Lee Irwin III
2004-08-25 21:10                 ` [5/4] move most signal functions " William Lee Irwin III
2004-08-25 23:56     ` [patch *] remove 450 unnecessary #includes of sched.h Tim Schmielau
2004-08-20 15:05 ` includes cleanup Tim Schmielau

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox