summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-07-25 16:49:55 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-02-16 18:08:07 +0100
commit0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9 (patch)
tree2435c39f3c5e4018fe6ffe72c2309349a1341cd7
parentdade7716925a4e9a31f249f9ca1ed4e2f1495a8c (diff)
downloadblackbird-op-linux-0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9.tar.gz
blackbird-op-linux-0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9.zip
x86: Convert nmi_lock to raw_spinlock
nmi_lock must be a spinning spinlock in -rt. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/apic/nmi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
index 0159a69396cb..24e7742d633a 100644
--- a/arch/x86/kernel/apic/nmi.c
+++ b/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;
OpenPOWER on IntegriCloud