From: Adrian Bunk - proper prototypes for the following functions: - ctrl_alt_del() (in include/linux/reboot.h) - getrusage() (in include/linux/resource.h) - make the following needlessly global functions static: - kernel_restart_prepare() - kernel_kexec() Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- arch/arm/mach-ixp4xx/nas100d-power.c | 3 +-- arch/arm/mach-ixp4xx/nslu2-power.c | 3 +-- arch/mips/kernel/irixsig.c | 3 +-- arch/mips/kernel/sysirix.c | 2 +- arch/um/drivers/mconsole_kern.c | 2 -- drivers/char/keyboard.c | 1 + drivers/s390/char/sclp_quiesce.c | 3 +-- include/linux/reboot.h | 4 ++-- include/linux/resource.h | 2 ++ kernel/exit.c | 3 +-- kernel/sys.c | 5 ++--- 11 files changed, 13 insertions(+), 18 deletions(-) diff -puN arch/arm/mach-ixp4xx/nas100d-power.c~kernel-sysc-cleanups arch/arm/mach-ixp4xx/nas100d-power.c --- devel/arch/arm/mach-ixp4xx/nas100d-power.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/arch/arm/mach-ixp4xx/nas100d-power.c 2006-05-21 14:48:14.000000000 -0700 @@ -20,11 +20,10 @@ #include #include #include +#include #include -extern void ctrl_alt_del(void); - static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs) { /* Signal init to do the ctrlaltdel action, this will bypass init if diff -puN arch/arm/mach-ixp4xx/nslu2-power.c~kernel-sysc-cleanups arch/arm/mach-ixp4xx/nslu2-power.c --- devel/arch/arm/mach-ixp4xx/nslu2-power.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/arch/arm/mach-ixp4xx/nslu2-power.c 2006-05-21 14:48:14.000000000 -0700 @@ -20,11 +20,10 @@ #include #include #include +#include #include -extern void ctrl_alt_del(void); - static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs) { /* Signal init to do the ctrlaltdel action, this will bypass init if diff -puN arch/mips/kernel/irixsig.c~kernel-sysc-cleanups arch/mips/kernel/irixsig.c --- devel/arch/mips/kernel/irixsig.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irixsig.c 2006-05-21 14:48:14.000000000 -0700 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -540,8 +541,6 @@ out: #define IRIX_P_PGID 2 #define IRIX_P_ALL 7 -extern int getrusage(struct task_struct *, int, struct rusage __user *); - #define W_EXITED 1 #define W_TRAPPED 2 #define W_STOPPED 4 diff -puN arch/mips/kernel/sysirix.c~kernel-sysc-cleanups arch/mips/kernel/sysirix.c --- devel/arch/mips/kernel/sysirix.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/arch/mips/kernel/sysirix.c 2006-05-21 14:48:14.000000000 -0700 @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -235,7 +236,6 @@ asmlinkage int irix_prctl(unsigned optio #undef DEBUG_PROCGRPS extern unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt); -extern int getrusage(struct task_struct *p, int who, struct rusage __user *ru); extern char *prom_getenv(char *name); extern long prom_setenv(char *name, char *value); diff -puN arch/um/drivers/mconsole_kern.c~kernel-sysc-cleanups arch/um/drivers/mconsole_kern.c --- devel/arch/um/drivers/mconsole_kern.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/arch/um/drivers/mconsole_kern.c 2006-05-21 14:48:14.000000000 -0700 @@ -300,8 +300,6 @@ void mconsole_reboot(struct mc_request * machine_restart(NULL); } -extern void ctrl_alt_del(void); - void mconsole_cad(struct mc_request *req) { mconsole_reply(req, "", 0, 0); diff -puN drivers/char/keyboard.c~kernel-sysc-cleanups drivers/char/keyboard.c --- devel/drivers/char/keyboard.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/drivers/char/keyboard.c 2006-05-21 14:48:34.000000000 -0700 @@ -39,6 +39,7 @@ #include #include #include +#include #ifdef CONFIG_MAC_EMUMOUSEBTN #include diff -puN drivers/s390/char/sclp_quiesce.c~kernel-sysc-cleanups drivers/s390/char/sclp_quiesce.c --- devel/drivers/s390/char/sclp_quiesce.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/drivers/s390/char/sclp_quiesce.c 2006-05-21 14:48:14.000000000 -0700 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -66,8 +67,6 @@ do_machine_quiesce(void) } #endif -extern void ctrl_alt_del(void); - /* Handler for quiesce event. Start shutdown procedure. */ static void sclp_quiesce_handler(struct evbuf_header *evbuf) diff -puN include/linux/reboot.h~kernel-sysc-cleanups include/linux/reboot.h --- devel/include/linux/reboot.h~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/include/linux/reboot.h 2006-05-21 14:48:14.000000000 -0700 @@ -59,13 +59,13 @@ extern void machine_crash_shutdown(struc * Architecture independent implemenations of sys_reboot commands. */ -extern void kernel_restart_prepare(char *cmd); extern void kernel_shutdown_prepare(enum system_states state); extern void kernel_restart(char *cmd); extern void kernel_halt(void); extern void kernel_power_off(void); -extern void kernel_kexec(void); + +void ctrl_alt_del(void); /* * Emergency restart, callable from an interrupt handler. diff -puN include/linux/resource.h~kernel-sysc-cleanups include/linux/resource.h --- devel/include/linux/resource.h~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/include/linux/resource.h 2006-05-21 14:48:14.000000000 -0700 @@ -67,4 +67,6 @@ struct rlimit { */ #include +int getrusage(struct task_struct *p, int who, struct rusage __user *ru); + #endif diff -puN kernel/exit.c~kernel-sysc-cleanups kernel/exit.c --- devel/kernel/exit.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/kernel/exit.c 2006-05-21 14:48:14.000000000 -0700 @@ -36,6 +36,7 @@ #include #include #include /* for audit_free() */ +#include #include #include @@ -45,8 +46,6 @@ extern void sem_exit (void); extern struct task_struct *child_reaper; -int getrusage(struct task_struct *, int, struct rusage __user *); - static void exit_mm(struct task_struct * tsk); static void __unhash_process(struct task_struct *p) diff -puN kernel/sys.c~kernel-sysc-cleanups kernel/sys.c --- devel/kernel/sys.c~kernel-sysc-cleanups 2006-05-21 14:48:14.000000000 -0700 +++ devel-akpm/kernel/sys.c 2006-05-21 14:48:14.000000000 -0700 @@ -589,7 +589,7 @@ void emergency_restart(void) } EXPORT_SYMBOL_GPL(emergency_restart); -void kernel_restart_prepare(char *cmd) +static void kernel_restart_prepare(char *cmd) { blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); system_state = SYSTEM_RESTART; @@ -623,7 +623,7 @@ EXPORT_SYMBOL_GPL(kernel_restart); * Move into place and start executing a preloaded standalone * executable. If nothing was preloaded return an error. */ -void kernel_kexec(void) +static void kernel_kexec(void) { #ifdef CONFIG_KEXEC struct kimage *image; @@ -637,7 +637,6 @@ void kernel_kexec(void) machine_kexec(image); #endif } -EXPORT_SYMBOL_GPL(kernel_kexec); void kernel_shutdown_prepare(enum system_states state) { _