From 5428660bd97da6f8031b880b8a8955ffd3b93dc8 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 13 Mar 2009 14:49:49 +1030
Subject: [PATCH] --- yaml --- r: 140543 b: refs/heads/master c:
 fcef8576d8a64fc603e719c97d423f9f6d4e0e8b h: refs/heads/master i:   140541:
 ca4613fc0b6dd14a0af7342aaeb63fb1710b1f95   140539:
 c49d1a43fcb9c59840cbed6a1cef7925f7d310ad   140535:
 ef9e95aca0ca60eace6cdc39b6a474d8130b0af1   140527:
 fea11042efbcc181bc47ec42d4bb2233027d5a64   140511:
 56ddcb7f7b504701600cb23dfeec0788dc84bb23   140479:
 91a9e1306757499d7811d990ce51f8521f65d9ee   140415:
 37995231e4a38607119964d71fedd717e9365184   140287:
 5cc369f156f403011c296af939a0a602dec0afa3 v: v3

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

diff --git a/[refs] b/[refs]
index b0344f1643ce..4613299596ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc9b83dd1f66402b870301c3c7117b9c1484abb4
+refs/heads/master: fcef8576d8a64fc603e719c97d423f9f6d4e0e8b
diff --git a/trunk/arch/x86/kernel/apic/nmi.c b/trunk/arch/x86/kernel/apic/nmi.c
index bdfad80c3cf1..d6bd62407152 100644
--- a/trunk/arch/x86/kernel/apic/nmi.c
+++ b/trunk/arch/x86/kernel/apic/nmi.c
@@ -39,7 +39,7 @@
 int unknown_nmi_panic;
 int nmi_watchdog_enabled;
 
-static cpumask_t backtrace_mask = CPU_MASK_NONE;
+static cpumask_var_t backtrace_mask;
 
 /* nmi_active:
  * >0: the lapic NMI watchdog is active, but can be disabled
@@ -138,6 +138,7 @@ int __init check_nmi_watchdog(void)
 	if (!prev_nmi_count)
 		goto error;
 
+	alloc_cpumask_var(&backtrace_mask, GFP_KERNEL);
 	printk(KERN_INFO "Testing NMI watchdog ... ");
 
 #ifdef CONFIG_SMP
@@ -413,14 +414,14 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
 		touched = 1;
 	}
 
-	if (cpu_isset(cpu, backtrace_mask)) {
+	if (cpumask_test_cpu(cpu, backtrace_mask)) {
 		static DEFINE_SPINLOCK(lock);	/* Serialise the printks */
 
 		spin_lock(&lock);
 		printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu);
 		dump_stack();
 		spin_unlock(&lock);
-		cpu_clear(cpu, backtrace_mask);
+		cpumask_clear_cpu(cpu, backtrace_mask);
 	}
 
 	/* Could check oops_in_progress here too, but it's safer not to */
@@ -554,10 +555,10 @@ void __trigger_all_cpu_backtrace(void)
 {
 	int i;
 
-	backtrace_mask = cpu_online_map;
+	cpumask_copy(backtrace_mask, cpu_online_mask);
 	/* Wait for up to 10 seconds for all CPUs to do the backtrace */
 	for (i = 0; i < 10 * 1000; i++) {
-		if (cpus_empty(backtrace_mask))
+		if (cpumask_empty(backtrace_mask))
 			break;
 		mdelay(1);
 	}