diff --git a/[refs] b/[refs]
index 7401b1c0c8dd..3912dbbe8f49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c8decdf14b17d42f6eb817d310642f4d6598a19
+refs/heads/master: 96f9dcb10755e96eae706b9e869c0dc25adb3d74
diff --git a/trunk/arch/x86/kernel/nmi_64.c b/trunk/arch/x86/kernel/nmi_64.c
index f546e3164a74..d98b21cd4928 100644
--- a/trunk/arch/x86/kernel/nmi_64.c
+++ b/trunk/arch/x86/kernel/nmi_64.c
@@ -98,7 +98,7 @@ int __init check_nmi_watchdog(void)
 		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
 #endif
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_possible_cpu(cpu)
 		prev_nmi_count[cpu] = cpu_pda(cpu)->__nmi_count;
 	local_irq_enable();
 	mdelay((20*1000)/nmi_hz); // wait 20 ticks