diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-05-09 08:47:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-09 11:44:42 +0200 |
| commit | 57da8b960b9a25646a8ddb5a9c1d0b5978e69bec (patch) | |
| tree | da46e6e57f983389dce36bb6ccdc7ce477cb0ca4 /arch/x86/kernel/nmi.c | |
| parent | febb72a6e4cc6c8cffcc1ea649a3fb364f1ea432 (diff) | |
| download | linux-stable-57da8b960b9a25646a8ddb5a9c1d0b5978e69bec.tar.gz linux-stable-57da8b960b9a25646a8ddb5a9c1d0b5978e69bec.tar.bz2 linux-stable-57da8b960b9a25646a8ddb5a9c1d0b5978e69bec.zip | |
x86: Avoid double stack traces with show_regs()
What was called show_registers() so far already showed a stack
trace for kernel faults, and kernel_stack_pointer() isn't even
valid to be used for faults from user mode, hence it was
pointless for show_regs() to call show_trace() after
show_registers().
Simply rename show_registers() to show_regs() and eliminate
the old definition.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/4FAA3D3902000078000826E1@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 47acaf319165..03c134544966 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -244,7 +244,7 @@ io_check_error(unsigned char reason, struct pt_regs *regs) pr_emerg( "NMI: IOCK error (debug interrupt?) for reason %02x on CPU %d.\n", reason, smp_processor_id()); - show_registers(regs); + show_regs(regs); if (panic_on_io_nmi) panic("NMI IOCK error: Not continuing"); |