Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83cc5ed3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 76a8ad29

arch/arm/mach-ixp4xx/nas100d-power.c

+1 −2
Original line number Diff line number Diff line
@@ -20,11 +20,10 @@ 
#include <linux/module.h>

#include <linux/reboot.h>

#include <linux/interrupt.h>

#include <linux/reboot.h>



#include <asm/mach-types.h>



extern void ctrl_alt_del(void);



static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs)

{

	/* Signal init to do the ctrlaltdel action, this will bypass init if

arch/arm/mach-ixp4xx/nslu2-power.c

+1 −2
Original line number Diff line number Diff line
@@ -20,11 +20,10 @@ 
#include <linux/module.h>

#include <linux/reboot.h>

#include <linux/interrupt.h>

#include <linux/reboot.h>



#include <asm/mach-types.h>



extern void ctrl_alt_del(void);



static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs)

{

	/* Signal init to do the ctrlaltdel action, this will bypass init if

arch/mips/kernel/irixsig.c

+1 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/smp_lock.h>

#include <linux/time.h>

#include <linux/ptrace.h>

#include <linux/resource.h>



#include <asm/ptrace.h>

#include <asm/uaccess.h>
@@ -540,8 +541,6 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set, 
#define IRIX_P_PGID   2

#define IRIX_P_ALL    7



extern int getrusage(struct task_struct *, int, struct rusage __user *);



#define W_EXITED     1

#define W_TRAPPED    2

#define W_STOPPED    4

arch/mips/kernel/sysirix.c

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/socket.h>

#include <linux/security.h>

#include <linux/syscalls.h>

#include <linux/resource.h>



#include <asm/ptrace.h>

#include <asm/page.h>
@@ -235,7 +236,6 @@ asmlinkage int irix_prctl(unsigned option, ...) 
#undef DEBUG_PROCGRPS



extern unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt);

extern int getrusage(struct task_struct *p, int who, struct rusage __user *ru);

extern char *prom_getenv(char *name);

extern long prom_setenv(char *name, char *value);

arch/um/drivers/mconsole_kern.c

+0 −2
Original line number Diff line number Diff line
@@ -300,8 +300,6 @@ void mconsole_reboot(struct mc_request *req) 
	machine_restart(NULL);

}



extern void ctrl_alt_del(void);



void mconsole_cad(struct mc_request *req)

{

	mconsole_reply(req, "", 0, 0);