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>
This commit is contained in:
Lee Revell 2006-06-26 18:30:00 +02:00 коммит произвёл Adrian Bunk
Родитель a0ebb3ffd6
Коммит f18190bd34
8 изменённых файлов: 15 добавлений и 15 удалений

Просмотреть файл

@ -175,7 +175,7 @@ end
document trapinfo document trapinfo
Run info threads and lookup pid of thread #1 Run info threads and lookup pid of thread #1
'trapinfo <pid>' will tell you by which trap & possibly 'trapinfo <pid>' will tell you by which trap & possibly
addresthe kernel paniced. address the kernel panicked.
end end

Просмотреть файл

@ -163,7 +163,7 @@ static void nmi_shootdown_cpus(void)
void machine_crash_shutdown(struct pt_regs *regs) void machine_crash_shutdown(struct pt_regs *regs)
{ {
/* This function is only called after the system /* This function is only called after the system
* has paniced or is otherwise in a critical state. * has panicked or is otherwise in a critical state.
* The minimum amount of code to allow a kexec'd kernel * The minimum amount of code to allow a kexec'd kernel
* to run successfully needs to happen here. * to run successfully needs to happen here.
* *

Просмотреть файл

@ -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 panicked.
*/ */
#define POWERDOWN_FREQ (HZ / 4) #define POWERDOWN_FREQ (HZ / 4)
#define PANIC_FREQ (HZ / 8) #define PANIC_FREQ (HZ / 8)

Просмотреть файл

@ -28,13 +28,13 @@
#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 panicked.
*/ */
#define POWERDOWN_FREQ (HZ / 4) #define POWERDOWN_FREQ (HZ / 4)
#define PANIC_FREQ (HZ / 8) #define PANIC_FREQ (HZ / 8)
static struct timer_list power_timer, blink_timer, debounce_timer; static struct timer_list power_timer, blink_timer, debounce_timer;
static int has_paniced, shuting_down; static int has_panicked, shuting_down;
static void ip32_machine_restart(char *command) __attribute__((noreturn)); static void ip32_machine_restart(char *command) __attribute__((noreturn));
static void ip32_machine_halt(void) __attribute__((noreturn)); static void ip32_machine_halt(void) __attribute__((noreturn));
@ -109,7 +109,7 @@ static void debounce(unsigned long data)
} }
CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A); CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
if (has_paniced) if (has_panicked)
ip32_machine_restart(NULL); ip32_machine_restart(NULL);
enable_irq(MACEISA_RTC_IRQ); enable_irq(MACEISA_RTC_IRQ);
@ -117,7 +117,7 @@ static void debounce(unsigned long data)
static inline void ip32_power_button(void) static inline void ip32_power_button(void)
{ {
if (has_paniced) if (has_panicked)
return; return;
if (shuting_down || kill_proc(1, SIGINT, 1)) { if (shuting_down || kill_proc(1, SIGINT, 1)) {
@ -161,9 +161,9 @@ static int panic_event(struct notifier_block *this, unsigned long event,
{ {
unsigned long led; unsigned long led;
if (has_paniced) if (has_panicked)
return NOTIFY_DONE; return NOTIFY_DONE;
has_paniced = 1; has_panicked = 1;
/* turn off the green LED */ /* turn off the green LED */
led = mace->perif.ctrl.misc | MACEISA_LED_GREEN; led = mace->perif.ctrl.misc | MACEISA_LED_GREEN;

Просмотреть файл

@ -179,7 +179,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
/* /*
* This function is only called after the system * This function is only called after the system
* has paniced or is otherwise in a critical state. * has panicked or is otherwise in a critical state.
* The minimum amount of code to allow a kexec'd kernel * The minimum amount of code to allow a kexec'd kernel
* to run successfully needs to happen here. * to run successfully needs to happen here.
* *

Просмотреть файл

@ -161,7 +161,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
{ {
/* /*
* This function is only called after the system * This function is only called after the system
* has paniced or is otherwise in a critical state. * has panicked or is otherwise in a critical state.
* The minimum amount of code to allow a kexec'd kernel * The minimum amount of code to allow a kexec'd kernel
* to run successfully needs to happen here. * to run successfully needs to happen here.
* *

Просмотреть файл

@ -470,7 +470,7 @@ void smp_send_stop(void)
return; return;
/* Don't deadlock on the call lock in panic */ /* Don't deadlock on the call lock in panic */
if (!spin_trylock(&call_lock)) { if (!spin_trylock(&call_lock)) {
/* ignore locking because we have paniced anyways */ /* ignore locking because we have panicked anyways */
nolock = 1; nolock = 1;
} }
__smp_call_function(smp_really_stop_cpu, NULL, 0, 0); __smp_call_function(smp_really_stop_cpu, NULL, 0, 0);

Просмотреть файл

@ -3677,7 +3677,7 @@ static void send_panic_events(char *str)
} }
#endif /* CONFIG_IPMI_PANIC_EVENT */ #endif /* CONFIG_IPMI_PANIC_EVENT */
static int has_paniced = 0; static int has_panicked = 0;
static int panic_event(struct notifier_block *this, static int panic_event(struct notifier_block *this,
unsigned long event, unsigned long event,
@ -3686,9 +3686,9 @@ static int panic_event(struct notifier_block *this,
int i; int i;
ipmi_smi_t intf; ipmi_smi_t intf;
if (has_paniced) if (has_panicked)
return NOTIFY_DONE; return NOTIFY_DONE;
has_paniced = 1; has_panicked = 1;
/* For every registered interface, set it to run to completion. */ /* For every registered interface, set it to run to completion. */
for (i = 0; i < MAX_IPMI_INTERFACES; i++) { for (i = 0; i < MAX_IPMI_INTERFACES; i++) {