From a7b6507be26fd0a126acbc4940f6d0076d971042 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Tue, 4 Jan 2011 22:38:07 -0500 Subject: [PATCH] --- yaml --- r: 223971 b: refs/heads/master c: 9ab181fa9ff73a38fccd0a4f1c40a38dfe62b535 h: refs/heads/master i: 223969: 16b537df9b4dade849421315d30550610bd39f0b 223967: 32f3822db22fd0ae37f299e18226398884c002be v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/hw_nmi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 356b3b51dab1..a034310e9d87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aef1b9cef78ae65c6501850851cc3f61f9be477b +refs/heads/master: 9ab181fa9ff73a38fccd0a4f1c40a38dfe62b535 diff --git a/trunk/arch/x86/kernel/apic/hw_nmi.c b/trunk/arch/x86/kernel/apic/hw_nmi.c index c57d0b599448..2b40a6045da2 100644 --- a/trunk/arch/x86/kernel/apic/hw_nmi.c +++ b/trunk/arch/x86/kernel/apic/hw_nmi.c @@ -51,7 +51,7 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, { struct die_args *args = __args; struct pt_regs *regs; - int cpu = smp_processor_id(); + int cpu; switch (cmd) { case DIE_NMI: @@ -63,6 +63,7 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, } regs = args->regs; + cpu = smp_processor_id(); if (cpumask_test_cpu(cpu, to_cpumask(backtrace_mask))) { static arch_spinlock_t lock = __ARCH_SPIN_LOCK_UNLOCKED;