The patch titled
replace-cad_pid-by-a-struct-pid-fixes
has been removed from the -mm tree. Its filename is
replace-cad_pid-by-a-struct-pid-fixes.patch
This patch was dropped because it was folded into replace-cad_pid-by-a-struct-pid.patch
------------------------------------------------------
Subject: replace-cad_pid-by-a-struct-pid-fixes
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Cedric Le Goater <clg@xxxxxxxxxx>
Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/mips/sgi-ip22/ip22-reset.c | 3 ++-
drivers/char/nwbutton.c | 3 +--
drivers/parisc/power.c | 1 -
include/linux/sched.h | 2 +-
kernel/sys.c | 3 ++-
5 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/mips/sgi-ip22/ip22-reset.c~replace-cad_pid-by-a-struct-pid-fixes arch/mips/sgi-ip22/ip22-reset.c
--- a/arch/mips/sgi-ip22/ip22-reset.c~replace-cad_pid-by-a-struct-pid-fixes
+++ a/arch/mips/sgi-ip22/ip22-reset.c
@@ -123,7 +123,8 @@ static inline void power_button(void)
if (machine_state & MACHINE_PANICED)
return;
- if ((machine_state & MACHINE_SHUTTING_DOWN) || kill_cad_pid(SIGINT, 1)) {
+ if ((machine_state & MACHINE_SHUTTING_DOWN) ||
+ kill_cad_pid(SIGINT, 1)) {
/* No init process or button pressed twice. */
sgi_machine_power_off();
}
diff -puN drivers/char/nwbutton.c~replace-cad_pid-by-a-struct-pid-fixes drivers/char/nwbutton.c
--- a/drivers/char/nwbutton.c~replace-cad_pid-by-a-struct-pid-fixes
+++ a/drivers/char/nwbutton.c
@@ -127,9 +127,8 @@ static void button_consume_callbacks (in
static void button_sequence_finished (unsigned long parameters)
{
#ifdef CONFIG_NWBUTTON_REBOOT /* Reboot using button is enabled */
- if (button_press_count == reboot_count) {
+ if (button_press_count == reboot_count)
kill_cad_pid(SIGINT, 1); /* Ask init to reboot us */
- }
#endif /* CONFIG_NWBUTTON_REBOOT */
button_consume_callbacks (button_press_count);
bcount = sprintf (button_output_buffer, "%d\n", button_press_count);
diff -puN drivers/parisc/power.c~replace-cad_pid-by-a-struct-pid-fixes drivers/parisc/power.c
--- a/drivers/parisc/power.c~replace-cad_pid-by-a-struct-pid-fixes
+++ a/drivers/parisc/power.c
@@ -84,7 +84,6 @@
static void deferred_poweroff(void *dummy)
{
- extern int cad_pid; /* from kernel/sys.c */
if (kill_cad_pid(SIGINT, 1)) {
/* just in case killing init process failed */
machine_power_off();
diff -puN include/linux/sched.h~replace-cad_pid-by-a-struct-pid-fixes include/linux/sched.h
--- a/include/linux/sched.h~replace-cad_pid-by-a-struct-pid-fixes
+++ a/include/linux/sched.h
@@ -1093,7 +1093,7 @@ static inline int is_init(struct task_st
return tsk->pid == 1;
}
-extern struct pid* cad_pid;
+extern struct pid *cad_pid;
extern void free_task(struct task_struct *tsk);
#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
diff -puN kernel/sys.c~replace-cad_pid-by-a-struct-pid-fixes kernel/sys.c
--- a/kernel/sys.c~replace-cad_pid-by-a-struct-pid-fixes
+++ a/kernel/sys.c
@@ -92,7 +92,8 @@ EXPORT_SYMBOL(fs_overflowgid);
*/
int C_A_D = 1;
-struct pid* cad_pid = NULL;
+struct pid *cad_pid;
+EXPORT_SYMBOL(cad_pid);
/*
* Notifier list for kernel code which wants to be called
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list-module-taint-flags-in-oops-panic.patch
move-pidmap-to-pspaceh.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process.patch
knfsd-move-tempsock-aging-to-a-timer.patch
namespaces-add-nsproxy.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
rename-the-provided-execve-functions-to-kernel_execve.patch
replace-cad_pid-by-a-struct-pid.patch
replace-cad_pid-by-a-struct-pid-fixes.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
