git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-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
a9c58e0
..
66df5ac
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
/*
#define POWERDOWN_TIMEOUT 120
/*
- * Blink frequency during reboot grace period and when paniced.
+ * Blink frequency during reboot grace period and when panic
k
ed.
*/
#define POWERDOWN_FREQ (HZ / 4)
#define PANIC_FREQ (HZ / 8)
*/
#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_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();
}
/* No init process or button pressed twice. */
sgi_machine_power_off();
}
@@
-168,7
+169,7
@@
static inline void volume_down_button(unsigned long data)
}
}
}
}
-static irqreturn_t panel_int(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t panel_int(int irq, void *dev_id)
{
unsigned int buttons;
{
unsigned int buttons;