From 9c566d1857c779ff426c6e6cdc474d708bc5a4ef Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 25 Jul 2009 16:49:55 +0200
Subject: [PATCH] --- yaml --- r: 185155 b: refs/heads/master c:
 0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9 h: refs/heads/master i:   185153:
 67102da69aff4aa6fc56e7852e6da25d4fca715f   185151:
 4d178c6715f3ac6d22d097a4abaa590181d12816 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/apic/nmi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fbd6ad709e7d..316adc240f7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dade7716925a4e9a31f249f9ca1ed4e2f1495a8c
+refs/heads/master: 0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9
diff --git a/trunk/arch/x86/kernel/apic/nmi.c b/trunk/arch/x86/kernel/apic/nmi.c
index 0159a69396cb..24e7742d633a 100644
--- a/trunk/arch/x86/kernel/apic/nmi.c
+++ b/trunk/arch/x86/kernel/apic/nmi.c
@@ -416,13 +416,13 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
 
 	/* We can be called before check_nmi_watchdog, hence NULL check. */
 	if (cpumask_test_cpu(cpu, to_cpumask(backtrace_mask))) {
-		static DEFINE_SPINLOCK(lock);	/* Serialise the printks */
+		static DEFINE_RAW_SPINLOCK(lock); /* Serialise the printks */
 
-		spin_lock(&lock);
+		raw_spin_lock(&lock);
 		printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu);
 		show_regs(regs);
 		dump_stack();
-		spin_unlock(&lock);
+		raw_spin_unlock(&lock);
 		cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));
 
 		rc = 1;