The patch titled
kernel/sys.c: cleanups
has been removed from the -mm tree. Its filename is
kernel-sysc-cleanups.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: kernel/sys.c: cleanups
From: Adrian Bunk <bunk@xxxxxxxxx>
- 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@xxxxxxxx: compile fix]
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/arm/mach-ixp4xx/nas100d-power.c | 3 +--
arch/arm/mach-ixp4xx/nslu2-power.c | 3 +--
arch/mips/kernel/irixsig.c | 3 +--
arch/mips/kernel/sysirix.c | 2 +-
arch/um/drivers/mconsole_kern.c | 2 --
drivers/char/keyboard.c | 1 +
drivers/s390/char/sclp_quiesce.c | 3 +--
include/linux/reboot.h | 4 ++--
include/linux/resource.h | 4 ++++
kernel/exit.c | 3 +--
kernel/sys.c | 5 ++---
11 files changed, 15 insertions(+), 18 deletions(-)
diff -puN arch/arm/mach-ixp4xx/nas100d-power.c~kernel-sysc-cleanups arch/arm/mach-ixp4xx/nas100d-power.c
--- a/arch/arm/mach-ixp4xx/nas100d-power.c~kernel-sysc-cleanups
+++ a/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -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
diff -puN arch/arm/mach-ixp4xx/nslu2-power.c~kernel-sysc-cleanups arch/arm/mach-ixp4xx/nslu2-power.c
--- a/arch/arm/mach-ixp4xx/nslu2-power.c~kernel-sysc-cleanups
+++ a/arch/arm/mach-ixp4xx/nslu2-power.c
@@ -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
diff -puN arch/mips/kernel/irixsig.c~kernel-sysc-cleanups arch/mips/kernel/irixsig.c
--- a/arch/mips/kernel/irixsig.c~kernel-sysc-cleanups
+++ a/arch/mips/kernel/irixsig.c
@@ -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 @@ out:
#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
diff -puN arch/mips/kernel/sysirix.c~kernel-sysc-cleanups arch/mips/kernel/sysirix.c
--- a/arch/mips/kernel/sysirix.c~kernel-sysc-cleanups
+++ a/arch/mips/kernel/sysirix.c
@@ -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 optio
#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);
diff -puN arch/um/drivers/mconsole_kern.c~kernel-sysc-cleanups arch/um/drivers/mconsole_kern.c
--- a/arch/um/drivers/mconsole_kern.c~kernel-sysc-cleanups
+++ a/arch/um/drivers/mconsole_kern.c
@@ -300,8 +300,6 @@ void mconsole_reboot(struct mc_request *
machine_restart(NULL);
}
-extern void ctrl_alt_del(void);
-
void mconsole_cad(struct mc_request *req)
{
mconsole_reply(req, "", 0, 0);
diff -puN drivers/char/keyboard.c~kernel-sysc-cleanups drivers/char/keyboard.c
--- a/drivers/char/keyboard.c~kernel-sysc-cleanups
+++ a/drivers/char/keyboard.c
@@ -39,6 +39,7 @@
#include <linux/vt_kern.h>
#include <linux/sysrq.h>
#include <linux/input.h>
+#include <linux/reboot.h>
static void kbd_disconnect(struct input_handle *handle);
extern void ctrl_alt_del(void);
diff -puN drivers/s390/char/sclp_quiesce.c~kernel-sysc-cleanups drivers/s390/char/sclp_quiesce.c
--- a/drivers/s390/char/sclp_quiesce.c~kernel-sysc-cleanups
+++ a/drivers/s390/char/sclp_quiesce.c
@@ -13,6 +13,7 @@
#include <linux/cpumask.h>
#include <linux/smp.h>
#include <linux/init.h>
+#include <linux/reboot.h>
#include <asm/atomic.h>
#include <asm/ptrace.h>
#include <asm/sigp.h>
@@ -66,8 +67,6 @@ do_machine_quiesce(void)
}
#endif
-extern void ctrl_alt_del(void);
-
/* Handler for quiesce event. Start shutdown procedure. */
static void
sclp_quiesce_handler(struct evbuf_header *evbuf)
diff -puN include/linux/reboot.h~kernel-sysc-cleanups include/linux/reboot.h
--- a/include/linux/reboot.h~kernel-sysc-cleanups
+++ a/include/linux/reboot.h
@@ -59,13 +59,13 @@ extern void machine_crash_shutdown(struc
* Architecture independent implemenations of sys_reboot commands.
*/
-extern void kernel_restart_prepare(char *cmd);
extern void kernel_shutdown_prepare(enum system_states state);
extern void kernel_restart(char *cmd);
extern void kernel_halt(void);
extern void kernel_power_off(void);
-extern void kernel_kexec(void);
+
+void ctrl_alt_del(void);
/*
* Emergency restart, callable from an interrupt handler.
diff -puN include/linux/resource.h~kernel-sysc-cleanups include/linux/resource.h
--- a/include/linux/resource.h~kernel-sysc-cleanups
+++ a/include/linux/resource.h
@@ -3,6 +3,8 @@
#include <linux/time.h>
+struct task_struct;
+
/*
* Resource control/accounting header file for linux
*/
@@ -67,4 +69,6 @@ struct rlimit {
*/
#include <asm/resource.h>
+int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
+
#endif
diff -puN kernel/exit.c~kernel-sysc-cleanups kernel/exit.c
--- a/kernel/exit.c~kernel-sysc-cleanups
+++ a/kernel/exit.c
@@ -36,6 +36,7 @@
#include <linux/compat.h>
#include <linux/pipe_fs_i.h>
#include <linux/audit.h> /* for audit_free() */
+#include <linux/resource.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
@@ -45,8 +46,6 @@
extern void sem_exit (void);
extern struct task_struct *child_reaper;
-int getrusage(struct task_struct *, int, struct rusage __user *);
-
static void exit_mm(struct task_struct * tsk);
static void __unhash_process(struct task_struct *p)
diff -puN kernel/sys.c~kernel-sysc-cleanups kernel/sys.c
--- a/kernel/sys.c~kernel-sysc-cleanups
+++ a/kernel/sys.c
@@ -589,7 +589,7 @@ void emergency_restart(void)
}
EXPORT_SYMBOL_GPL(emergency_restart);
-void kernel_restart_prepare(char *cmd)
+static void kernel_restart_prepare(char *cmd)
{
blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
system_state = SYSTEM_RESTART;
@@ -623,7 +623,7 @@ EXPORT_SYMBOL_GPL(kernel_restart);
* Move into place and start executing a preloaded standalone
* executable. If nothing was preloaded return an error.
*/
-void kernel_kexec(void)
+static void kernel_kexec(void)
{
#ifdef CONFIG_KEXEC
struct kimage *image;
@@ -637,7 +637,6 @@ void kernel_kexec(void)
machine_kexec(image);
#endif
}
-EXPORT_SYMBOL_GPL(kernel_kexec);
void kernel_shutdown_prepare(enum system_states state)
{
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
acpiphp-use-new-dock-driver.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
git-agpgart.patch
the-scheduled-unexport-of-insert_resource.patch
git-gfs2.patch
make-drivers-scsi-pata_pcmciacpcmcia_remove_one-static.patch
ni5010-netcard-cleanup-fix.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
fs-bufferc-possible-cleanups.patch
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks-fix.patch
time-i386-clocksource-drivers.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag-tidy.patch
task-watchers-register-semundo-task-watcher-cleanup.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
fbdev-remove-unused-exports.patch
md-make-md_print_devices-static.patch
drivers-md-mdc-make-code-static.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
