--- a/arch/i386/kernel/nmi.c	2006-01-27 07:51:04.000000000 +0100
+++ b/arch/i386/kernel/nmi.c	2006-01-27 07:52:14.000000000 +0100
@@ -148,7 +148,7 @@
 	if (nmi_watchdog == NMI_LOCAL_APIC)
 		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
 	local_irq_enable();
 	mdelay((10*1000)/nmi_hz); // wait 10 ticks