diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/momentum/ocelot_g/gt-irq.c | 4 | ||||
-rw-r--r-- | arch/mips/oprofile/common.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-reset.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-reset.c | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c index e5eceed1beff..8bd9b844fa9e 100644 --- a/arch/mips/momentum/ocelot_g/gt-irq.c +++ b/arch/mips/momentum/ocelot_g/gt-irq.c | |||
@@ -59,7 +59,7 @@ void hook_irq_handler(int int_cause, int bit_num, void *isr_ptr) | |||
59 | * bit_num - Indicates which bit number in the cause register | 59 | * bit_num - Indicates which bit number in the cause register |
60 | * | 60 | * |
61 | * Outputs : | 61 | * Outputs : |
62 | * 1 if succesful, 0 if failure | 62 | * 1 if successful, 0 if failure |
63 | */ | 63 | */ |
64 | int enable_galileo_irq(int int_cause, int bit_num) | 64 | int enable_galileo_irq(int int_cause, int bit_num) |
65 | { | 65 | { |
@@ -83,7 +83,7 @@ int enable_galileo_irq(int int_cause, int bit_num) | |||
83 | * bit_num - Indicates which bit number in the cause register | 83 | * bit_num - Indicates which bit number in the cause register |
84 | * | 84 | * |
85 | * Outputs : | 85 | * Outputs : |
86 | * 1 if succesful, 0 if failure | 86 | * 1 if successful, 0 if failure |
87 | */ | 87 | */ |
88 | int disable_galileo_irq(int int_cause, int bit_num) | 88 | int disable_galileo_irq(int int_cause, int bit_num) |
89 | { | 89 | { |
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c index c31e4cff64e0..65eb55400d77 100644 --- a/arch/mips/oprofile/common.c +++ b/arch/mips/oprofile/common.c | |||
@@ -38,7 +38,7 @@ static int op_mips_create_files(struct super_block * sb, struct dentry * root) | |||
38 | 38 | ||
39 | for (i = 0; i < model->num_counters; ++i) { | 39 | for (i = 0; i < model->num_counters; ++i) { |
40 | struct dentry *dir; | 40 | struct dentry *dir; |
41 | char buf[3]; | 41 | char buf[4]; |
42 | 42 | ||
43 | snprintf(buf, sizeof buf, "%d", i); | 43 | snprintf(buf, sizeof buf, "%d", i); |
44 | dir = oprofilefs_mkdir(sb, root, buf); | 44 | dir = oprofilefs_mkdir(sb, root, buf); |
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c index a9c58e067b53..8134220ed600 100644 --- a/arch/mips/sgi-ip22/ip22-reset.c +++ b/arch/mips/sgi-ip22/ip22-reset.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #define POWERDOWN_TIMEOUT 120 | 34 | #define POWERDOWN_TIMEOUT 120 |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Blink frequency during reboot grace period and when paniced. | 37 | * Blink frequency during reboot grace period and when panicked. |
38 | */ | 38 | */ |
39 | #define POWERDOWN_FREQ (HZ / 4) | 39 | #define POWERDOWN_FREQ (HZ / 4) |
40 | #define PANIC_FREQ (HZ / 8) | 40 | #define PANIC_FREQ (HZ / 8) |
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 | ||
36 | static struct timer_list power_timer, blink_timer, debounce_timer; | 36 | static struct timer_list power_timer, blink_timer, debounce_timer; |
37 | static int has_paniced, shuting_down; | 37 | static int has_panicked, shuting_down; |
38 | 38 | ||
39 | static void ip32_machine_restart(char *command) __attribute__((noreturn)); | 39 | static void ip32_machine_restart(char *command) __attribute__((noreturn)); |
40 | static void ip32_machine_halt(void) __attribute__((noreturn)); | 40 | static 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 | ||
118 | static inline void ip32_power_button(void) | 118 | static 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; |