aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi-ip32
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/sgi-ip32')
-rw-r--r--arch/mips/sgi-ip32/ip32-reset.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index ab9d9cef089e..79ddb4605659 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -28,13 +28,13 @@
28 28
29#define POWERDOWN_TIMEOUT 120 29#define POWERDOWN_TIMEOUT 120
30/* 30/*
31 * Blink frequency during reboot grace period and when paniced. 31 * Blink frequency during reboot grace period and when panicked.
32 */ 32 */
33#define POWERDOWN_FREQ (HZ / 4) 33#define POWERDOWN_FREQ (HZ / 4)
34#define PANIC_FREQ (HZ / 8) 34#define PANIC_FREQ (HZ / 8)
35 35
36static struct timer_list power_timer, blink_timer, debounce_timer; 36static struct timer_list power_timer, blink_timer, debounce_timer;
37static int has_paniced, shuting_down; 37static int has_panicked, shuting_down;
38 38
39static void ip32_machine_restart(char *command) __attribute__((noreturn)); 39static void ip32_machine_restart(char *command) __attribute__((noreturn));
40static void ip32_machine_halt(void) __attribute__((noreturn)); 40static void ip32_machine_halt(void) __attribute__((noreturn));
@@ -109,7 +109,7 @@ static void debounce(unsigned long data)
109 } 109 }
110 CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A); 110 CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
111 111
112 if (has_paniced) 112 if (has_panicked)
113 ip32_machine_restart(NULL); 113 ip32_machine_restart(NULL);
114 114
115 enable_irq(MACEISA_RTC_IRQ); 115 enable_irq(MACEISA_RTC_IRQ);
@@ -117,7 +117,7 @@ static void debounce(unsigned long data)
117 117
118static inline void ip32_power_button(void) 118static inline void ip32_power_button(void)
119{ 119{
120 if (has_paniced) 120 if (has_panicked)
121 return; 121 return;
122 122
123 if (shuting_down || kill_proc(1, SIGINT, 1)) { 123 if (shuting_down || kill_proc(1, SIGINT, 1)) {
@@ -161,9 +161,9 @@ static int panic_event(struct notifier_block *this, unsigned long event,
161{ 161{
162 unsigned long led; 162 unsigned long led;
163 163
164 if (has_paniced) 164 if (has_panicked)
165 return NOTIFY_DONE; 165 return NOTIFY_DONE;
166 has_paniced = 1; 166 has_panicked = 1;
167 167
168 /* turn off the green LED */ 168 /* turn off the green LED */
169 led = mace->perif.ctrl.misc | MACEISA_LED_GREEN; 169 led = mace->perif.ctrl.misc | MACEISA_LED_GREEN;