From: Andrew Morton <akpm@osdl.org>

Cc: Andi Kleen <ak@muc.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/nmi.c   |    2 +-
 arch/x86_64/kernel/nmi.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/nmi.c~spinlock-debug-all-cpu-backtrace-fix-3 arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/nmi.c~spinlock-debug-all-cpu-backtrace-fix-3
+++ a/arch/i386/kernel/nmi.c
@@ -914,11 +914,11 @@ __kprobes int nmi_watchdog_tick(struct p
 	if (cpu_isset(cpu, backtrace_mask)) {
 		static DEFINE_SPINLOCK(lock);	/* Serialise the printks */
 
-		cpu_clear(cpu, backtrace_mask);
 		spin_lock(&lock);
 		printk("NMI backtrace for cpu %d\n", cpu);
 		dump_stack();
 		spin_unlock(&lock);
+		cpu_clear(cpu, backtrace_mask);
 	}
 
 	sum = per_cpu(irq_stat, cpu).apic_timer_irqs;
diff -puN arch/x86_64/kernel/nmi.c~spinlock-debug-all-cpu-backtrace-fix-3 arch/x86_64/kernel/nmi.c
--- a/arch/x86_64/kernel/nmi.c~spinlock-debug-all-cpu-backtrace-fix-3
+++ a/arch/x86_64/kernel/nmi.c
@@ -806,11 +806,11 @@ int __kprobes nmi_watchdog_tick(struct p
 	if (cpu_isset(cpu, backtrace_mask)) {
 		static DEFINE_SPINLOCK(lock);	/* Serialise the printks */
 
-		cpu_clear(cpu, backtrace_mask);
 		spin_lock(&lock);
 		printk("NMI backtrace for cpu %d\n", cpu);
 		dump_stack();
 		spin_unlock(&lock);
+		cpu_clear(cpu, backtrace_mask);
 	}
 
 #ifdef CONFIG_X86_MCE
_