Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[sfrench/cifs-2.6.git] / arch / mips / sgi-ip22 / ip22-reset.c

diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index a9c58e067b5392d8dfbf14fbad4fea11e4bec1e9..7a941ecff3bbd505066013f125118b55c9c0d39f 100644 (file)
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -34,7 +34,7 @@
 #define POWERDOWN_TIMEOUT      120
 
 /*
- * Blink frequency during reboot grace period and when paniced.
+ * Blink frequency during reboot grace period and when panicked.
  */
 #define POWERDOWN_FREQ         (HZ / 4)
 #define PANIC_FREQ             (HZ / 8)
@@ -123,7 +123,8 @@ 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();
        }