kernel/sys.c: possible cleanups
Subsystems (7)
RFC PATCH 1/1 kernel/sys.c: possible cleanups
This patch contains the following possible cleanups:
- 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()
- remove the following unused EXPORT_SYMBOL:
- in_egroup_p
- remove the following unused EXPORT_SYMBOL_GPL's:
- kernel_restart
- kernel_halt
Signed-off-by Adrian Bunk <[email protected]>
---
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 | 2 +- drivers/s390/char/sclp_quiesce.c | 3 +-- include/linux/reboot.h | 4 ++-- include/linux/resource.h | 2 ++ kernel/exit.c | 3 +-- kernel/sys.c | 10 ++-------- 11 files changed, 13 insertions(+), 24 deletions(-)
include/linux/reboot.h renamed from include/linux/reboot.h.old +2 -2
@@ -59,13 +59,13 @@* 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.
include/linux/resource.h renamed from include/linux/resource.h.old +2 -0
@@ -67,4 +67,6 @@*/ #include <asm/resource.h> +int getrusage (struct task_struct *p,int who,struct rusage __user *ru); +#endif
kernel/sys.c renamed from kernel/sys.c.old +2 -8
@@ -589,7 +589,7 @@ }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 ;
@@ -615,7 +615,6 @@printk (".\n" );machine_restart (cmd); } -EXPORT_SYMBOL_GPL (kernel_restart);/** * kernel_kexec - reboot the system
@@ -623,7 +622,7 @@* 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 +636,6 @@machine_kexec (image);#endif } -EXPORT_SYMBOL_GPL (kernel_kexec);void kernel_shutdown_prepare (enum system_states state) {
@@ -658,8 +656,6 @@machine_halt (); } -EXPORT_SYMBOL_GPL (kernel_halt); -/** * kernel_power_off - power_off the system *
@@ -1666,8 +1662,6 @@return retval; } -EXPORT_SYMBOL (in_egroup_p); -DECLARE_RWSEM (uts_sem);EXPORT_SYMBOL (uts_sem);
arch/arm/mach-ixp4xx/nas100d-power.c renamed from arch/arm/mach-ixp4xx/nas100d-power.c.old +1 -2
@@ -20,11 +20,10 @@#include <linux/module.h> #include <linux/reboot.h> #include <linux/interrupt.h> +#include <linux/reboot.h> #include <asm/mach-types.h> -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
arch/arm/mach-ixp4xx/nslu2-power.c renamed from arch/arm/mach-ixp4xx/nslu2-power.c.old +1 -2
@@ -20,11 +20,10 @@#include <linux/module.h> #include <linux/reboot.h> #include <linux/interrupt.h> +#include <linux/reboot.h> #include <asm/mach-types.h> -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
arch/um/drivers/mconsole_kern.c renamed from arch/um/drivers/mconsole_kern.c.old +0 -2
@@ -300,8 +300,6 @@machine_restart (NULL ); } -extern void ctrl_alt_del (void ); -void mconsole_cad (struct mc_request *req) {mconsole_reply (req,"" ,0 ,0 );
drivers/char/keyboard.c renamed from drivers/char/keyboard.c.old +1 -1
@@ -39,9 +39,9 @@#include <linux/vt_kern.h> #include <linux/sysrq.h> #include <linux/input.h> +#include <linux/reboot.h> static void kbd_disconnect (struct input_handle *handle); -extern void ctrl_alt_del (void );/* * Exported functions/variables
drivers/s390/char/sclp_quiesce.c renamed from drivers/s390/char/sclp_quiesce.c.old +1 -2
@@ -13,6 +13,7 @@#include <linux/cpumask.h> #include <linux/smp.h> #include <linux/init.h> +#include <linux/reboot.h> #include <asm/atomic.h> #include <asm/ptrace.h> #include <asm/sigp.h>
@@ -66,8 +67,6 @@ }#endif -extern void ctrl_alt_del (void ); -/* Handler for quiesce event. Start shutdown procedure. */ static void sclp_quiesce_handler (struct evbuf_header *evbuf)
arch/mips/kernel/irixsig.c renamed from arch/mips/kernel/irixsig.c.old +1 -2
@@ -13,6 +13,7 @@#include <linux/smp_lock.h> #include <linux/time.h> #include <linux/ptrace.h> +#include <linux/resource.h> #include <asm/ptrace.h> #include <asm/uaccess.h>
@@ -540,8 +541,6 @@#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
arch/mips/kernel/sysirix.c renamed from arch/mips/kernel/sysirix.c.old +1 -1
@@ -31,6 +31,7 @@#include <linux/socket.h> #include <linux/security.h> #include <linux/syscalls.h> +#include <linux/resource.h> #include <asm/ptrace.h> #include <asm/page.h>
@@ -235,7 +236,6 @@#undef DEBUG_PROCGRPSextern 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);
kernel/exit.c renamed from kernel/exit.c.old +1 -2
@@ -37,6 +37,7 @@#include <linux/compat.h> #include <linux/pipe_fs_i.h> #include <linux/audit.h> /* for audit_free() */ +#include <linux/resource.h> #include <asm/uaccess.h> #include <asm/unistd.h>
@@ -46,8 +47,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)