diff options
author | Lee Revell <rlrevell@joe-job.com> | 2006-06-26 12:30:00 -0400 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-06-26 12:30:00 -0400 |
commit | f18190bd3407554ba6df30a1927e07e6cba93e56 (patch) | |
tree | 0df4f4f575242923d670ef77b4978d22a4a98bf4 | |
parent | a0ebb3ffd6c195011f7e4abdfc40f98342d36ce2 (diff) |
fix paniced->panicked typos
In a testament to the utter simplicity and logic of the English
language ;-), I found a single correct use - in kernel/panic.c - and
10-15 incorrect ones.
Signed-Off-By: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r-- | Documentation/kdump/gdbmacros.txt | 2 | ||||
-rw-r--r-- | arch/i386/kernel/crash.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-reset.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-reset.c | 12 | ||||
-rw-r--r-- | arch/powerpc/kernel/crash.c | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/crash.c | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/smp.c | 2 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 6 |
8 files changed, 15 insertions, 15 deletions
diff --git a/Documentation/kdump/gdbmacros.txt b/Documentation/kdump/gdbmacros.txt index dcf5580380ab..9b9b454b048a 100644 --- a/Documentation/kdump/gdbmacros.txt +++ b/Documentation/kdump/gdbmacros.txt | |||
@@ -175,7 +175,7 @@ end | |||
175 | document trapinfo | 175 | document trapinfo |
176 | Run info threads and lookup pid of thread #1 | 176 | Run info threads and lookup pid of thread #1 |
177 | 'trapinfo <pid>' will tell you by which trap & possibly | 177 | 'trapinfo <pid>' will tell you by which trap & possibly |
178 | addresthe kernel paniced. | 178 | address the kernel panicked. |
179 | end | 179 | end |
180 | 180 | ||
181 | 181 | ||
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c index 21dc1bbb8067..13288d9793a7 100644 --- a/arch/i386/kernel/crash.c +++ b/arch/i386/kernel/crash.c | |||
@@ -163,7 +163,7 @@ static void nmi_shootdown_cpus(void) | |||
163 | void machine_crash_shutdown(struct pt_regs *regs) | 163 | void machine_crash_shutdown(struct pt_regs *regs) |
164 | { | 164 | { |
165 | /* This function is only called after the system | 165 | /* This function is only called after the system |
166 | * has paniced or is otherwise in a critical state. | 166 | * has panicked or is otherwise in a critical state. |
167 | * The minimum amount of code to allow a kexec'd kernel | 167 | * The minimum amount of code to allow a kexec'd kernel |
168 | * to run successfully needs to happen here. | 168 | * to run successfully needs to happen here. |
169 | * | 169 | * |
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; |
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index dbcb85994f46..e253a45dcf10 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c | |||
@@ -179,7 +179,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) | |||
179 | 179 | ||
180 | /* | 180 | /* |
181 | * This function is only called after the system | 181 | * This function is only called after the system |
182 | * has paniced or is otherwise in a critical state. | 182 | * has panicked or is otherwise in a critical state. |
183 | * The minimum amount of code to allow a kexec'd kernel | 183 | * The minimum amount of code to allow a kexec'd kernel |
184 | * to run successfully needs to happen here. | 184 | * to run successfully needs to happen here. |
185 | * | 185 | * |
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c index 4e6c3b729e39..15beddc7fdf5 100644 --- a/arch/x86_64/kernel/crash.c +++ b/arch/x86_64/kernel/crash.c | |||
@@ -161,7 +161,7 @@ void machine_crash_shutdown(struct pt_regs *regs) | |||
161 | { | 161 | { |
162 | /* | 162 | /* |
163 | * This function is only called after the system | 163 | * This function is only called after the system |
164 | * has paniced or is otherwise in a critical state. | 164 | * has panicked or is otherwise in a critical state. |
165 | * The minimum amount of code to allow a kexec'd kernel | 165 | * The minimum amount of code to allow a kexec'd kernel |
166 | * to run successfully needs to happen here. | 166 | * to run successfully needs to happen here. |
167 | * | 167 | * |
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c index 4a6628b14d99..e369a3426df4 100644 --- a/arch/x86_64/kernel/smp.c +++ b/arch/x86_64/kernel/smp.c | |||
@@ -470,7 +470,7 @@ void smp_send_stop(void) | |||
470 | return; | 470 | return; |
471 | /* Don't deadlock on the call lock in panic */ | 471 | /* Don't deadlock on the call lock in panic */ |
472 | if (!spin_trylock(&call_lock)) { | 472 | if (!spin_trylock(&call_lock)) { |
473 | /* ignore locking because we have paniced anyways */ | 473 | /* ignore locking because we have panicked anyways */ |
474 | nolock = 1; | 474 | nolock = 1; |
475 | } | 475 | } |
476 | __smp_call_function(smp_really_stop_cpu, NULL, 0, 0); | 476 | __smp_call_function(smp_really_stop_cpu, NULL, 0, 0); |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 9f2f8fdec69a..586f1f81937a 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
@@ -3677,7 +3677,7 @@ static void send_panic_events(char *str) | |||
3677 | } | 3677 | } |
3678 | #endif /* CONFIG_IPMI_PANIC_EVENT */ | 3678 | #endif /* CONFIG_IPMI_PANIC_EVENT */ |
3679 | 3679 | ||
3680 | static int has_paniced = 0; | 3680 | static int has_panicked = 0; |
3681 | 3681 | ||
3682 | static int panic_event(struct notifier_block *this, | 3682 | static int panic_event(struct notifier_block *this, |
3683 | unsigned long event, | 3683 | unsigned long event, |
@@ -3686,9 +3686,9 @@ static int panic_event(struct notifier_block *this, | |||
3686 | int i; | 3686 | int i; |
3687 | ipmi_smi_t intf; | 3687 | ipmi_smi_t intf; |
3688 | 3688 | ||
3689 | if (has_paniced) | 3689 | if (has_panicked) |
3690 | return NOTIFY_DONE; | 3690 | return NOTIFY_DONE; |
3691 | has_paniced = 1; | 3691 | has_panicked = 1; |
3692 | 3692 | ||
3693 | /* For every registered interface, set it to run to completion. */ | 3693 | /* For every registered interface, set it to run to completion. */ |
3694 | for (i = 0; i < MAX_IPMI_INTERFACES; i++) { | 3694 | for (i = 0; i < MAX_IPMI_INTERFACES; i++) { |