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 /arch/arm/mach-ixp4xx | |
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 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-power.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-power.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c index 99d333d7ebdd..a3745ed37f9f 100644 --- a/arch/arm/mach-ixp4xx/nas100d-power.c +++ b/arch/arm/mach-ixp4xx/nas100d-power.c | |||
@@ -20,11 +20,10 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/reboot.h> | 21 | #include <linux/reboot.h> |
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | #include <linux/reboot.h> | ||
23 | 24 | ||
24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
25 | 26 | ||
26 | extern void ctrl_alt_del(void); | ||
27 | |||
28 | static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs) | 27 | static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs) |
29 | { | 28 | { |
30 | /* Signal init to do the ctrlaltdel action, this will bypass init if | 29 | /* Signal init to do the ctrlaltdel action, this will bypass init if |
diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c index d80c362bc539..6d38e97142cc 100644 --- a/arch/arm/mach-ixp4xx/nslu2-power.c +++ b/arch/arm/mach-ixp4xx/nslu2-power.c | |||
@@ -20,11 +20,10 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/reboot.h> | 21 | #include <linux/reboot.h> |
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | #include <linux/reboot.h> | ||
23 | 24 | ||
24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
25 | 26 | ||
26 | extern void ctrl_alt_del(void); | ||
27 | |||
28 | static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs) | 27 | static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs) |
29 | { | 28 | { |
30 | /* Signal init to do the ctrlaltdel action, this will bypass init if | 29 | /* Signal init to do the ctrlaltdel action, this will bypass init if |