aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-25 08:47:41 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:06 -0400
commit83cc5ed3c4c65fc4c3729a5cec2111ede1ebf85e (patch)
treeea2b6b04117ad88c41a5059bdaf36a7a505808c0 /kernel
parent76a8ad293912cd2f01eca075d80cd0ddec30c627 (diff)
[PATCH] kernel/sys.c: 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() [akpm@osdl.org: compile fix] Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/exit.c3
-rw-r--r--kernel/sys.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index a3baf92462bd..b12a4706f73f 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -36,6 +36,7 @@
36#include <linux/compat.h> 36#include <linux/compat.h>
37#include <linux/pipe_fs_i.h> 37#include <linux/pipe_fs_i.h>
38#include <linux/audit.h> /* for audit_free() */ 38#include <linux/audit.h> /* for audit_free() */
39#include <linux/resource.h>
39 40
40#include <asm/uaccess.h> 41#include <asm/uaccess.h>
41#include <asm/unistd.h> 42#include <asm/unistd.h>
@@ -45,8 +46,6 @@
45extern void sem_exit (void); 46extern void sem_exit (void);
46extern struct task_struct *child_reaper; 47extern struct task_struct *child_reaper;
47 48
48int getrusage(struct task_struct *, int, struct rusage __user *);
49
50static void exit_mm(struct task_struct * tsk); 49static void exit_mm(struct task_struct * tsk);
51 50
52static void __unhash_process(struct task_struct *p) 51static void __unhash_process(struct task_struct *p)
diff --git a/kernel/sys.c b/kernel/sys.c
index 7e0927bad713..2d5179c67cec 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -589,7 +589,7 @@ void emergency_restart(void)
589} 589}
590EXPORT_SYMBOL_GPL(emergency_restart); 590EXPORT_SYMBOL_GPL(emergency_restart);
591 591
592void kernel_restart_prepare(char *cmd) 592static void kernel_restart_prepare(char *cmd)
593{ 593{
594 blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); 594 blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
595 system_state = SYSTEM_RESTART; 595 system_state = SYSTEM_RESTART;
@@ -623,7 +623,7 @@ EXPORT_SYMBOL_GPL(kernel_restart);
623 * Move into place and start executing a preloaded standalone 623 * Move into place and start executing a preloaded standalone
624 * executable. If nothing was preloaded return an error. 624 * executable. If nothing was preloaded return an error.
625 */ 625 */
626void kernel_kexec(void) 626static void kernel_kexec(void)
627{ 627{
628#ifdef CONFIG_KEXEC 628#ifdef CONFIG_KEXEC
629 struct kimage *image; 629 struct kimage *image;
@@ -637,7 +637,6 @@ void kernel_kexec(void)
637 machine_kexec(image); 637 machine_kexec(image);
638#endif 638#endif
639} 639}
640EXPORT_SYMBOL_GPL(kernel_kexec);
641 640
642void kernel_shutdown_prepare(enum system_states state) 641void kernel_shutdown_prepare(enum system_states state)
643{ 642{