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 /drivers | |
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 'drivers')
-rw-r--r-- | drivers/char/keyboard.c | 1 | ||||
-rw-r--r-- | drivers/s390/char/sclp_quiesce.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 5755b7e5f187..edd996f6fb87 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/vt_kern.h> | 39 | #include <linux/vt_kern.h> |
40 | #include <linux/sysrq.h> | 40 | #include <linux/sysrq.h> |
41 | #include <linux/input.h> | 41 | #include <linux/input.h> |
42 | #include <linux/reboot.h> | ||
42 | 43 | ||
43 | static void kbd_disconnect(struct input_handle *handle); | 44 | static void kbd_disconnect(struct input_handle *handle); |
44 | extern void ctrl_alt_del(void); | 45 | extern void ctrl_alt_del(void); |
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c index 56fa69168898..a4c53c172db6 100644 --- a/drivers/s390/char/sclp_quiesce.c +++ b/drivers/s390/char/sclp_quiesce.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/cpumask.h> | 13 | #include <linux/cpumask.h> |
14 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/reboot.h> | ||
16 | #include <asm/atomic.h> | 17 | #include <asm/atomic.h> |
17 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
18 | #include <asm/sigp.h> | 19 | #include <asm/sigp.h> |
@@ -66,8 +67,6 @@ do_machine_quiesce(void) | |||
66 | } | 67 | } |
67 | #endif | 68 | #endif |
68 | 69 | ||
69 | extern void ctrl_alt_del(void); | ||
70 | |||
71 | /* Handler for quiesce event. Start shutdown procedure. */ | 70 | /* Handler for quiesce event. Start shutdown procedure. */ |
72 | static void | 71 | static void |
73 | sclp_quiesce_handler(struct evbuf_header *evbuf) | 72 | sclp_quiesce_handler(struct evbuf_header *evbuf) |