diff options
| author | Linus Torvalds | 2011-03-15 19:16:00 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-03-15 19:16:00 -0700 |
| commit | 3904afb41d4316f7a2968c615d689e19149a4f84 (patch) | |
| tree | 0b10c467879019295d100908218e40265957fe88 /arch/x86/kernel/apic | |
| parent | 502f4d4f74219749a9758b9bbc27fb665b2e83ab (diff) | |
| parent | fd8fa4d3ddc4cc04ec8097e632b995d535c52beb (diff) | |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Combine printk()s in show_regs_common()
x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler()
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/hw_nmi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index 79fd43ca6f96..c4e557a1ebb6 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -83,7 +83,6 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, arch_spin_lock(&lock); printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu); show_regs(regs); - dump_stack(); arch_spin_unlock(&lock); cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask)); return NOTIFY_STOP; |