6 files changed, 9 insertions, 10 deletions

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 05668e3598c0..5fd65325b81a 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -371,11 +371,11 @@ static int acpi_cpufreq_early_init_acpi(void)
 
         dprintk("acpi_cpufreq_early_init\n");
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 data = kzalloc(sizeof(struct acpi_processor_performance), 
                         GFP_KERNEL);
                 if (!data) {
-                        for_each_cpu(j) {
+                        for_each_possible_cpu(j) {
                                 kfree(acpi_perf_data[j]);
                                 acpi_perf_data[j] = NULL;
                         }
@@ -584,7 +584,7 @@ acpi_cpufreq_exit (void)
 
         cpufreq_unregister_driver(&acpi_cpufreq_driver);
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 kfree(acpi_perf_data[i]);
                 acpi_perf_data[i] = NULL;
         }
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 31c3a5baaa7f..f7e4356f6820 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -361,11 +361,11 @@ static int centrino_cpu_early_init_acpi(void)
         unsigned int    i, j;
         struct acpi_processor_performance       *data;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 data = kzalloc(sizeof(struct acpi_processor_performance), 
                                 GFP_KERNEL);
                 if (!data) {
-                        for_each_cpu(j) {
+                        for_each_possible_cpu(j) {
                                 kfree(acpi_perf_data[j]);
                                 acpi_perf_data[j] = NULL;
                         }
@@ -805,7 +805,7 @@ static void __exit centrino_exit(void)
         cpufreq_unregister_driver(&centrino_driver);
 
 #ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
-        for_each_cpu(j) {
+        for_each_possible_cpu(j) {
                 kfree(acpi_perf_data[j]);
                 acpi_perf_data[j] = NULL;
         }
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 4f3a16b37f8f..879edb51d1e0 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -166,7 +166,7 @@ static void cache_shared_cpu_map_setup( unsigned int cpu,
 
         num_shared = (int) csi.num_shared;
         do {
-                for_each_cpu(j)
+                for_each_possible_cpu(j)
                         if (cpu_data(cpu)->socket_id == cpu_data(j)->socket_id
                                 && cpu_data(j)->core_id == csi.log1_cid
                                 && cpu_data(j)->thread_id == csi.log1_tid)
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index f4e2d8805c9e..1bbf822b4efc 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -180,7 +180,7 @@ static int setup_iic_hardcoded(void)
         unsigned long regs;
         struct iic *iic;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 iic = &per_cpu(iic, cpu);
                 nodeid = cpu/2;
 
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 9cbb781d6f80..fb5b761e3444 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -405,7 +405,6 @@ int __any_online_cpu(const cpumask_t *mask);
 #define any_online_cpu(mask)            0
 #endif
 
-#define for_each_cpu(cpu)  for_each_cpu_mask((cpu), cpu_possible_map)
 #define for_each_possible_cpu(cpu)  for_each_cpu_mask((cpu), cpu_possible_map)
 #define for_each_online_cpu(cpu)  for_each_cpu_mask((cpu), cpu_online_map)
 #define for_each_present_cpu(cpu) for_each_cpu_mask((cpu), cpu_present_map)
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index cee3397ec277..706c0025ec5e 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1761,7 +1761,7 @@ translate_compat_table(const char *name,
                 goto free_newinfo;
 
         /* And one copy for every other CPU */
-        for_each_cpu(i)
+        for_each_possible_cpu(i)
                 if (newinfo->entries[i] && newinfo->entries[i] != entry1)
                         memcpy(newinfo->entries[i], entry1, newinfo->size);