2 files changed, 5 insertions, 5 deletions

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 311b4e7266f1..3b329af4afc5 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -381,7 +381,7 @@ static void do_irq_balance(void)
         unsigned long imbalance = 0;
         cpumask_t allowed_mask, target_cpu_mask, tmp;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 int package_index;
                 CPU_IRQ(i) = 0;
                 if (!cpu_online(i))
@@ -632,7 +632,7 @@ static int __init balanced_irq_init(void)
         else 
                 printk(KERN_ERR "balanced_irq_init: failed to spawn balanced_irq");
 failed:
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 kfree(irq_cpu_data[i].irq_delta);
                 irq_cpu_data[i].irq_delta = NULL;
                 kfree(irq_cpu_data[i].last_irq);
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 9074818b9473..5ad6a2c92d27 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;
 
         /*