1 files changed, 5 insertions, 4 deletions

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 9074818b9473..d43b498ec745 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -138,12 +138,12 @@ static int __init check_nmi_watchdog(void)
         if (nmi_watchdog == NMI_LOCAL_APIC)
                 smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
 
-        for_each_cpu(cpu)
+        for_each_possible_cpu(cpu)
                 prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
         local_irq_enable();
         mdelay((10*1000)/nmi_hz); // wait 10 ticks
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
 #ifdef CONFIG_SMP
                 /* Check cpu_callin_map here because that is set
                    after the timer is started. */
@@ -510,7 +510,7 @@ void touch_nmi_watchdog (void)
          * Just reset the alert counters, (other CPUs might be
          * spinning on locks we hold):
          */
-        for_each_cpu(i)
+        for_each_possible_cpu(i)
                 alert_counter[i] = 0;
 
         /*
@@ -529,7 +529,8 @@ void nmi_watchdog_tick (struct pt_regs * regs)
          * always switch the stack NMI-atomically, it's safe to use
          * smp_processor_id().
          */
-        int sum, cpu = smp_processor_id();
+        unsigned int sum;
+        int cpu = smp_processor_id();
 
         sum = per_cpu(irq_stat, cpu).apic_timer_irqs;