diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-25 08:47:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:01:06 -0400 |
commit | 83cc5ed3c4c65fc4c3729a5cec2111ede1ebf85e (patch) | |
tree | ea2b6b04117ad88c41a5059bdaf36a7a505808c0 /include/linux | |
parent | 76a8ad293912cd2f01eca075d80cd0ddec30c627 (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 'include/linux')
-rw-r--r-- | include/linux/reboot.h | 4 | ||||
-rw-r--r-- | include/linux/resource.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 015297ff73fa..1dd1c707311f 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
@@ -59,13 +59,13 @@ extern void machine_crash_shutdown(struct pt_regs *); | |||
59 | * Architecture independent implemenations of sys_reboot commands. | 59 | * Architecture independent implemenations of sys_reboot commands. |
60 | */ | 60 | */ |
61 | 61 | ||
62 | extern void kernel_restart_prepare(char *cmd); | ||
63 | extern void kernel_shutdown_prepare(enum system_states state); | 62 | extern void kernel_shutdown_prepare(enum system_states state); |
64 | 63 | ||
65 | extern void kernel_restart(char *cmd); | 64 | extern void kernel_restart(char *cmd); |
66 | extern void kernel_halt(void); | 65 | extern void kernel_halt(void); |
67 | extern void kernel_power_off(void); | 66 | extern void kernel_power_off(void); |
68 | extern void kernel_kexec(void); | 67 | |
68 | void ctrl_alt_del(void); | ||
69 | 69 | ||
70 | /* | 70 | /* |
71 | * Emergency restart, callable from an interrupt handler. | 71 | * Emergency restart, callable from an interrupt handler. |
diff --git a/include/linux/resource.h b/include/linux/resource.h index 21a86cb6acdb..ae13db714742 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #include <linux/time.h> | 4 | #include <linux/time.h> |
5 | 5 | ||
6 | struct task_struct; | ||
7 | |||
6 | /* | 8 | /* |
7 | * Resource control/accounting header file for linux | 9 | * Resource control/accounting header file for linux |
8 | */ | 10 | */ |
@@ -67,4 +69,6 @@ struct rlimit { | |||
67 | */ | 69 | */ |
68 | #include <asm/resource.h> | 70 | #include <asm/resource.h> |
69 | 71 | ||
72 | int getrusage(struct task_struct *p, int who, struct rusage __user *ru); | ||
73 | |||
70 | #endif | 74 | #endif |