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 | |
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')
-rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-power.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-power.c | 3 | ||||
-rw-r--r-- | arch/mips/kernel/irixsig.c | 3 | ||||
-rw-r--r-- | arch/mips/kernel/sysirix.c | 2 | ||||
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 2 |
5 files changed, 4 insertions, 9 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 |
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index a9bf6cc3abd1..676e868d26fb 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
14 | #include <linux/time.h> | 14 | #include <linux/time.h> |
15 | #include <linux/ptrace.h> | 15 | #include <linux/ptrace.h> |
16 | #include <linux/resource.h> | ||
16 | 17 | ||
17 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
18 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
@@ -540,8 +541,6 @@ out: | |||
540 | #define IRIX_P_PGID 2 | 541 | #define IRIX_P_PGID 2 |
541 | #define IRIX_P_ALL 7 | 542 | #define IRIX_P_ALL 7 |
542 | 543 | ||
543 | extern int getrusage(struct task_struct *, int, struct rusage __user *); | ||
544 | |||
545 | #define W_EXITED 1 | 544 | #define W_EXITED 1 |
546 | #define W_TRAPPED 2 | 545 | #define W_TRAPPED 2 |
547 | #define W_STOPPED 4 | 546 | #define W_STOPPED 4 |
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 19e1ef43eb4b..1137dd6ea7aa 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/socket.h> | 31 | #include <linux/socket.h> |
32 | #include <linux/security.h> | 32 | #include <linux/security.h> |
33 | #include <linux/syscalls.h> | 33 | #include <linux/syscalls.h> |
34 | #include <linux/resource.h> | ||
34 | 35 | ||
35 | #include <asm/ptrace.h> | 36 | #include <asm/ptrace.h> |
36 | #include <asm/page.h> | 37 | #include <asm/page.h> |
@@ -235,7 +236,6 @@ asmlinkage int irix_prctl(unsigned option, ...) | |||
235 | #undef DEBUG_PROCGRPS | 236 | #undef DEBUG_PROCGRPS |
236 | 237 | ||
237 | extern unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt); | 238 | extern unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt); |
238 | extern int getrusage(struct task_struct *p, int who, struct rusage __user *ru); | ||
239 | extern char *prom_getenv(char *name); | 239 | extern char *prom_getenv(char *name); |
240 | extern long prom_setenv(char *name, char *value); | 240 | extern long prom_setenv(char *name, char *value); |
241 | 241 | ||
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 6d7173fc55a3..79149314ed04 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
@@ -300,8 +300,6 @@ void mconsole_reboot(struct mc_request *req) | |||
300 | machine_restart(NULL); | 300 | machine_restart(NULL); |
301 | } | 301 | } |
302 | 302 | ||
303 | extern void ctrl_alt_del(void); | ||
304 | |||
305 | void mconsole_cad(struct mc_request *req) | 303 | void mconsole_cad(struct mc_request *req) |
306 | { | 304 | { |
307 | mconsole_reply(req, "", 0, 0); | 305 | mconsole_reply(req, "", 0, 0); |