diff options
| author |   Alexander van Heukelum <heukelum@fastmail.fm> | 2008-10-22 12:00:13 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-10-22 14:00:26 +0200 |
| commit | e06ca430c3d0fddbd1c901ab3fb3e1f0bc8a786b (patch) | |
| tree | fba7a100a5110448bd0e9ca460b805a7931b01e6 /arch/x86/kernel/dumpstack_64.c | |
| parent | i386, dumpstack: use x86_64's method to account die_nest_count (diff) | |
| download | linux-dev-e06ca430c3d0fddbd1c901ab3fb3e1f0bc8a786b.tar.xz linux-dev-e06ca430c3d0fddbd1c901ab3fb3e1f0bc8a786b.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/dumpstack_64.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index dc6162bf7454..831e1e159cb4 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -519,7 +519,7 @@ void die(const char *str, struct pt_regs *regs, long err) oops_end(flags, regs, sig); } -notrace __kprobes void +void notrace __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic) { 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) return; - flags = oops_begin(); /* * We are in trouble anyway, lets at least try * to get a message out. */ + flags = oops_begin(); printk(KERN_EMERG "%s", str); printk(" on CPU%d, ip %08lx, registers:\n", smp_processor_id(), regs->ip); |