Remove sched.h inclusion from module.h
Subsystems (18)
I resurrected this ancient patch I did about 9 months ago that fell by the wayside. module.h pulls in sched.h, which means that anything built as a module pulls in a zillion (mostly unneeded) include files.
When I benchmarked the difference back last year, I'm fairly sure it was on the order of 2 minutes faster after the untangling below. Today, I'm only able to squeeze out a 30 second improvement on make allmodconfig. Maybe I had less RAM back then. *shrug*.
Build tested on x86/x86-64 only, other archs will likely need minor fixups in arch/.
Dave
# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/01/26 00:52:17-05:00 [email protected] # [INCLUDE] Remove sched.h inclusion from module.h. # Also move some capability bits to capability.h, and break # out some of sched.h to wakeup.h
#
# Build checked for make all modconfig,yesconfig,noconfig
#
# Signed-off-by: Dave Jones <[email protected]>
#
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -0
@@ -31,6 +31,7 @@#include <linux/cpufreq.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <linux/sched.h> /* current */ #include <asm/io.h> #include <asm/delay.h> #include <asm/uaccess.h>
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c +1 -0
@@ -28,6 +28,7 @@#include <linux/cpufreq.h> #include <linux/slab.h> #include <linux/cpumask.h> +#include <linux/sched.h> /* current / set_cpus_allowed() */ #include <asm/processor.h> #include <asm/msr.h>
arch/i386/kernel/cpu/cpufreq/powernow-k8.c +1 -0
@@ -30,6 +30,7 @@#include <linux/cpufreq.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/sched.h> /* for current / set_cpus_allowed() */ #include <asm/msr.h> #include <asm/io.h>
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +1 -0
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/config.h> +#include <linux/sched.h> /* current */ #include <linux/delay.h> #include <linux/compiler.h>
arch/i386/kernel/cpu/mtrr/if.c +1 -0
@@ -3,6 +3,7 @@#include <linux/ctype.h> #include <linux/module.h> #include <linux/seq_file.h> +#include <linux/capability.h> #include <asm/uaccess.h> #define LINE_SIZE 80
drivers/acpi/processor_idle.c +1 -0
@@ -35,6 +35,7 @@#include <linux/acpi.h> #include <linux/dmi.h> #include <linux/moduleparam.h> +#include <linux/sched.h> /* need_resched() */ #include <asm/io.h> #include <asm/uaccess.h>
drivers/block/paride/paride.c +1 -0
@@ -29,6 +29,7 @@#include <linux/string.h> #include <linux/spinlock.h> #include <linux/wait.h> +#include <linux/sched.h> /* TASK_* */ #ifdef CONFIG_PARPORT_MODULE #define CONFIG_PARPORT
drivers/block/paride/pg.c +2 -0
@@ -162,6 +162,8 @@#include <linux/mtio.h> #include <linux/pg.h> #include <linux/device.h> +#include <linux/sched.h> /* current, TASK_* */ +#include <linux/jiffies.h> #include <asm/uaccess.h>
drivers/block/paride/pt.c +1 -0
@@ -146,6 +146,7 @@#include <linux/slab.h> #include <linux/mtio.h> #include <linux/device.h> +#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */ #include <asm/uaccess.h>
drivers/char/i8k.c +1 -0
@@ -21,6 +21,7 @@#include <linux/init.h> #include <linux/proc_fs.h> #include <linux/apm_bios.h> +#include <linux/capability.h> #include <asm/uaccess.h> #include <asm/io.h>
drivers/char/watchdog/cpu5wdt.c +1 -0
@@ -28,6 +28,7 @@#include <linux/init.h> #include <linux/ioport.h> #include <linux/timer.h> +#include <linux/jiffies.h> #include <asm/io.h> #include <asm/uaccess.h>
drivers/char/watchdog/mixcomwd.c +2 -0
@@ -45,6 +45,8 @@#include <linux/fs.h> #include <linux/reboot.h> #include <linux/init.h> +#include <linux/jiffies.h> +#include <linux/timer.h> #include <asm/uaccess.h> #include <asm/io.h>
drivers/char/watchdog/pcwd.c +1 -1
@@ -66,7 +66,7 @@#include <linux/init.h> #include <linux/spinlock.h> #include <linux/reboot.h> - +#include <linux/sched.h> /* TASK_INTERRUPTIBLE, set_current_state() and friends */ #include <asm/uaccess.h> #include <asm/io.h>
drivers/char/watchdog/sc520_wdt.c +1 -0
@@ -63,6 +63,7 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/init.h> +#include <linux/jiffies.h> #include <asm/io.h> #include <asm/uaccess.h>
drivers/char/watchdog/softdog.c +2 -0
@@ -47,6 +47,8 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/init.h> +#include <linux/jiffies.h> +#include <asm/uaccess.h> #define PFX "SoftDog: "
drivers/infiniband/core/cache.c +1 -0
@@ -36,6 +36,7 @@#include <linux/module.h> #include <linux/errno.h> #include <linux/slab.h> +#include <linux/sched.h> /* INIT_WORK, schedule_work(), flush_scheduled_work() */ #include "core_priv.h"
drivers/input/gameport/gameport.c +1 -0
@@ -18,6 +18,7 @@#include <linux/slab.h> #include <linux/stddef.h> #include <linux/delay.h> +#include <linux/sched.h> /* HZ */ MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Generic gameport layer" );
drivers/input/joystick/a3d.c +1 -0
@@ -34,6 +34,7 @@#include <linux/init.h> #include <linux/gameport.h> #include <linux/input.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("FP-Gaming Assasin 3D joystick driver" );
drivers/input/joystick/adi.c +1 -0
@@ -36,6 +36,7 @@#include <linux/input.h> #include <linux/gameport.h> #include <linux/init.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Logitech ADI joystick family driver" );
drivers/input/joystick/analog.c +1 -0
@@ -38,6 +38,7 @@#include <linux/init.h> #include <linux/input.h> #include <linux/gameport.h> +#include <linux/jiffies.h> #include <asm/timex.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );
drivers/input/joystick/cobra.c +1 -0
@@ -34,6 +34,7 @@#include <linux/init.h> #include <linux/gameport.h> #include <linux/input.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Creative Labs Blaster GamePad Cobra driver" );
drivers/input/joystick/gf2k.c +1 -0
@@ -35,6 +35,7 @@#include <linux/init.h> #include <linux/input.h> #include <linux/gameport.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Genius Flight 2000 joystick driver" );
drivers/input/joystick/grip.c +1 -0
@@ -34,6 +34,7 @@#include <linux/slab.h> #include <linux/gameport.h> #include <linux/input.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Gravis GrIP protocol joystick driver" );
drivers/input/joystick/grip_mp.c +1 -0
@@ -19,6 +19,7 @@#include <linux/input.h> #include <linux/delay.h> #include <linux/proc_fs.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Brian Bonnlander" );MODULE_DESCRIPTION ("Gravis Grip Multiport driver" );
drivers/input/joystick/guillemot.c +1 -0
@@ -35,6 +35,7 @@#include <linux/init.h> #include <linux/gameport.h> #include <linux/input.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Guillemot Digital joystick driver" );
drivers/input/joystick/interact.c +1 -0
@@ -38,6 +38,7 @@#include <linux/init.h> #include <linux/gameport.h> #include <linux/input.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("InterAct digital joystick driver" );
drivers/input/joystick/sidewinder.c +1 -0
@@ -35,6 +35,7 @@#include <linux/init.h> #include <linux/input.h> #include <linux/gameport.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Microsoft SideWinder joystick family driver" );
drivers/input/joystick/tmdc.c +1 -0
@@ -38,6 +38,7 @@#include <linux/init.h> #include <linux/gameport.h> #include <linux/input.h> +#include <linux/jiffies.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("ThrustMaster DirectConnect joystick driver" );
drivers/isdn/capi/capifs.c +1 -0
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/ctype.h> +#include <linux/sched.h> /* current */ MODULE_DESCRIPTION ("CAPI4Linux: /dev/capi/ filesystem" );MODULE_AUTHOR ("Carsten Paeth" );
drivers/media/radio/miropcm20-rds.c +1 -0
@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/fs.h> #include <linux/miscdevice.h> +#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */ #include <linux/delay.h> #include <asm/uaccess.h> #include "miropcm20-rds-core.h"
drivers/mtd/mtdblock.c +1 -0
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/sched.h> /* TASK_* */ #include <linux/mtd/mtd.h> #include <linux/mtd/blktrans.h>
drivers/mtd/mtdchar.c +1 -0
@@ -13,6 +13,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/fs.h> +#include <linux/sched.h> /* TASK_* */ #include <asm/uaccess.h> #ifdef CONFIG_DEVFS_FS
drivers/mtd/mtdconcat.c +1 -1
@@ -14,7 +14,7 @@#include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h> - +#include <linux/sched.h> /* TASK_* */ #include <linux/mtd/mtd.h> #include <linux/mtd/concat.h>
drivers/scsi/scsi_transport_fc.c +1 -0
@@ -19,6 +19,7 @@*/ #include <linux/module.h> #include <linux/init.h> +#include <linux/sched.h> /* workqueue stuff, HZ */ #include <scsi/scsi_device.h> #include <scsi/scsi_host.h> #include <scsi/scsi_transport.h>
drivers/w1/w1_family.c +1 -0
@@ -21,6 +21,7 @@#include <linux/spinlock.h> #include <linux/list.h> +#include <linux/sched.h> /* schedule_timeout() */ #include <linux/delay.h> #include "w1_family.h"
fs/filesystems.c +1 -0
@@ -12,6 +12,7 @@#include <linux/kmod.h> #include <linux/init.h> #include <linux/module.h> +#include <linux/sched.h> /* for 'current' */ #include <asm/uaccess.h> /*
fs/jffs2/background.c +1 -0
@@ -15,6 +15,7 @@#include <linux/jffs2.h> #include <linux/mtd/mtd.h> #include <linux/completion.h> +#include <linux/sched.h> #include "nodelist.h"
fs/jffs2/wbuf.c +2 -0
@@ -18,6 +18,8 @@#include <linux/mtd/mtd.h> #include <linux/crc32.h> #include <linux/mtd/nand.h> +#include <linux/jiffies.h> +#include "nodelist.h" /* For testing write failures */
include/linux/capability.h +15 -0
@@ -357,6 +357,21 @@#define cap_is_fs_cap (c) (CAP_TO_MASK(c) & CAP_FS_MASK) +#ifdef CONFIG_SECURITY +/* code is in security.c */ +extern int capable (int cap); +#else +static inline int capable (int cap) +{ +if (cap_raised (current->cap_effective, cap)) { + current->flags |=PF_SUPERPRIV ; +return 1 ; + } +return 0 ; +} +#endif +#endif /* __KERNEL__ */ #endif /* !_LINUX_CAPABILITY_H */ +
include/linux/cpufreq.h +1 -0
@@ -23,6 +23,7 @@#include <linux/completion.h> #include <linux/workqueue.h> #include <linux/cpumask.h> +#include <asm/div64.h> #define CPUFREQ_NAME_LEN 16
include/linux/i2c.h +1 -0
@@ -32,6 +32,7 @@#include <linux/types.h> #include <linux/i2c-id.h> #include <linux/device.h> /* for struct device */ +#include <linux/sched.h> /* for completion */ #include <asm/semaphore.h> /* --- General options ------------------------------------------------ */
include/linux/module.h +2 -2
@@ -7,7 +7,6 @@* Rewritten again by Rusty Russell, 2002 */ #include <linux/config.h> -#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/list.h> #include <linux/stat.h>
@@ -18,8 +17,9 @@#include <linux/stringify.h> #include <linux/kobject.h> #include <linux/moduleparam.h> -#include <asm/local.h> +#include <linux/wait.h> +#include <asm/local.h> #include <asm/module.h> /* Not Yet Implemented */
include/linux/sched.h +2 -23
@@ -818,15 +818,8 @@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_new_task (struct task_struct * tsk, -unsigned long clone_flags)); -#ifdef CONFIG_SMP -extern void kick_process (struct task_struct *tsk); -#else -static inline void kick_process (struct task_struct *tsk) { } -#endif +#include <linux/wait.h> +extern void FASTCALL (sched_fork (task_t * p));extern void FASTCALL (sched_exit (task_t * p));
@@ -894,20 +887,6 @@ : on_sig_stack(sp) ? SS_ONSTACK : 0); } - -#ifdef CONFIG_SECURITY -/* code is in security.c */ -extern int capable (int cap); -#else -static inline int capable (int cap) -{ -if (cap_raised (current->cap_effective, cap)) { - current->flags |=PF_SUPERPRIV ; -return 1 ; - } -return 0 ; -} -#endif /* * Routines for handling mm_structs
include/linux/wait.h +10 -0
@@ -147,6 +147,16 @@int FASTCALL (out_of_line_wait_on_bit_lock (void *,int ,int (*)(void *),unsigned ));wait_queue_head_t *FASTCALL (bit_waitqueue (void *,int )); +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_new_task (struct task_struct * tsk, +unsigned long clone_flags)); +#ifdef CONFIG_SMP +extern void kick_process (struct task_struct *tsk); +#else +static inline void kick_process (struct task_struct *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)#define wake_up_all (x) __wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 0, NULL)
include/pcmcia/ss.h +1 -0
@@ -19,6 +19,7 @@#include <pcmcia/cs.h> #include <pcmcia/bulkmem.h> #include <linux/device.h> +#include <linux/sched.h> /* task_struct, completion */ /* Definitions for card status flags for GetStatus */ #define SS_WRPROT 0x0001
include/scsi/scsi_cmnd.h +1 -0
@@ -4,6 +4,7 @@#include <linux/dma-mapping.h> #include <linux/list.h> #include <linux/types.h> +#include <linux/timer.h> struct request ;struct scatterlist ;
include/scsi/scsi_transport_fc.h +1 -0
@@ -21,6 +21,7 @@#define SCSI_TRANSPORT_FC_H #include <linux/config.h> +#include <linux/sched.h> /* work_struct */ struct scsi_transport_template ;
kernel/kallsyms.c +1 -0
@@ -18,6 +18,7 @@#include <linux/fs.h> #include <linux/err.h> #include <linux/proc_fs.h> +#include <linux/sched.h> /* for cond_resched */ #include <linux/mm.h> #include <asm/sections.h>
sound/oss/ac97_codec.c +1 -0
@@ -55,6 +55,7 @@#include <linux/pci.h> #include <linux/ac97_codec.h> #include <asm/uaccess.h> +#include <asm/semaphore.h> #define CODEC_ID_BUFSZ 14