[PATCH] Use kill_cad_pid() in ip22-reset.c

Sukadev Bhattiprolu sukadev at us.ibm.com
Tue Sep 19 15:49:51 PDT 2006


This is very similar to Cedric's change to ip32-reset.c in the cad_pid
patch.

Suka
---


Use kill_cad_pid() to signal the init process instead of the hard coded pid 1.

Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Dave Hansen <haveblue at us.ibm.com>
Cc: Serge Hallyn <serue at us.ibm.com>
Cc: containers at lists.osdl.org

---
 arch/mips/sgi-ip22/ip22-reset.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lx26-18-rc6-mm2/arch/mips/sgi-ip22/ip22-reset.c
===================================================================
--- lx26-18-rc6-mm2.orig/arch/mips/sgi-ip22/ip22-reset.c	2006-09-19 15:37:58.000000000 -0700
+++ lx26-18-rc6-mm2/arch/mips/sgi-ip22/ip22-reset.c	2006-09-19 15:38:20.000000000 -0700
@@ -123,7 +123,7 @@ static inline void power_button(void)
 	if (machine_state & MACHINE_PANICED)
 		return;
 
-	if ((machine_state & MACHINE_SHUTTING_DOWN) || kill_proc(1,SIGINT,1)) {
+	if ((machine_state & MACHINE_SHUTTING_DOWN) || kill_cad_pid(SIGINT,1)) {
 		/* No init process or button pressed twice.  */
 		sgi_machine_power_off();
 	}



More information about the Containers mailing list