openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i386, dumpstack: use oops_begin/oops_end in die_nmi 

Use oops_begin and oops_end in die_nmi.

Whitespace-only changes on x86_64, to make it equal to i386's
version.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexander van Heukelum 2008-10-22 12:00:13 +02:00 committed by Ingo Molnar
parent e4955cfd2f
commit e06ca430c3
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/x86/kernel/dumpstack_32.c
View File

@ -390,40 +390,29 @@ void die(const char *str, struct pt_regs *regs, long err)
oops_end(flags, regs, sig); oops_end(flags, regs, sig);
} }
static DEFINE_SPINLOCK(nmi_print_lock);
void notrace __kprobes void notrace __kprobes
die_nmi(char *str, struct pt_regs *regs, int do_panic) die_nmi(char *str, struct pt_regs *regs, int do_panic)
{ {
unsigned long flags;
if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP) if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)
return; return;
spin_lock(&nmi_print_lock);
/* /*
* We are in trouble anyway, lets at least try * We are in trouble anyway, lets at least try
* to get a message out: * to get a message out.
*/ */
bust_spinlocks(1); flags = oops_begin();
printk(KERN_EMERG "%s", str); printk(KERN_EMERG "%s", str);
printk(" on CPU%d, ip %08lx, registers:\n", printk(" on CPU%d, ip %08lx, registers:\n",
smp_processor_id(), regs->ip); smp_processor_id(), regs->ip);
show_registers(regs); show_registers(regs);
if (do_panic) oops_end(flags, regs, 0);
if (do_panic || panic_on_oops)
panic("Non maskable interrupt"); panic("Non maskable interrupt");
console_silent(); nmi_exit();
spin_unlock(&nmi_print_lock); local_irq_enable();
do_exit(SIGBUS);
/*
* If we are in kernel we are probably nested up pretty bad
* and might aswell get out now while we still can:
*/
if (!user_mode_vm(regs)) {
current->thread.trap_no = 2;
crash_kexec(regs);
}
bust_spinlocks(0);
do_exit(SIGSEGV);
} }
static int __init oops_setup(char *s) static int __init oops_setup(char *s)

4
arch/x86/kernel/dumpstack_64.c
View File

@ -519,7 +519,7 @@ void die(const char *str, struct pt_regs *regs, long err)
oops_end(flags, regs, sig); oops_end(flags, regs, sig);
} }
notrace __kprobes void void notrace __kprobes
die_nmi(char *str, struct pt_regs *regs, int do_panic) die_nmi(char *str, struct pt_regs *regs, int do_panic)
{ {
unsigned long flags; unsigned long flags;
@ -527,11 +527,11 @@ die_nmi(char *str, struct pt_regs *regs, int do_panic)
if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP) if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)
return; return;
flags = oops_begin();
/* /*
* We are in trouble anyway, lets at least try * We are in trouble anyway, lets at least try
* to get a message out. * to get a message out.
*/ */
flags = oops_begin();
printk(KERN_EMERG "%s", str); printk(KERN_EMERG "%s", str);
printk(" on CPU%d, ip %08lx, registers:\n", printk(" on CPU%d, ip %08lx, registers:\n",
smp_processor_id(), regs->ip); smp_processor_id(), regs->ip);