From: Andrew Morton Convert a few stragglers over to for_each_possible_cpu(), remove for_each_cpu(). Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 6 +++--- arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 6 +++--- arch/ia64/kernel/topology.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 2 +- include/linux/cpumask.h | 1 - net/ipv4/netfilter/ip_tables.c | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~remove-for_each_cpu arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c --- devel/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~remove-for_each_cpu 2006-04-22 01:37:13.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-04-22 01:37:13.000000000 -0700 @@ -372,11 +372,11 @@ static int acpi_cpufreq_early_init_acpi( 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 -puN arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~remove-for_each_cpu arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c --- devel/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~remove-for_each_cpu 2006-04-22 01:37:13.000000000 -0700 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-04-22 01:37:13.000000000 -0700 @@ -365,11 +365,11 @@ static int centrino_cpu_early_init_acpi( 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; } @@ -809,7 +809,7 @@ static void __exit centrino_exit(void) cpufreq_unregister_driver(¢rino_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 -puN arch/ia64/kernel/topology.c~remove-for_each_cpu arch/ia64/kernel/topology.c --- devel/arch/ia64/kernel/topology.c~remove-for_each_cpu 2006-04-22 01:37:13.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/topology.c 2006-04-22 01:37:13.000000000 -0700 @@ -166,7 +166,7 @@ static void cache_shared_cpu_map_setup( 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 -puN arch/powerpc/platforms/cell/interrupt.c~remove-for_each_cpu arch/powerpc/platforms/cell/interrupt.c --- devel/arch/powerpc/platforms/cell/interrupt.c~remove-for_each_cpu 2006-04-22 01:37:13.000000000 -0700 +++ devel-akpm/arch/powerpc/platforms/cell/interrupt.c 2006-04-22 01:37:13.000000000 -0700 @@ -200,7 +200,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 -puN include/linux/cpumask.h~remove-for_each_cpu include/linux/cpumask.h --- devel/include/linux/cpumask.h~remove-for_each_cpu 2006-04-22 01:37:13.000000000 -0700 +++ devel-akpm/include/linux/cpumask.h 2006-04-22 01:37:13.000000000 -0700 @@ -405,7 +405,6 @@ int __any_online_cpu(const cpumask_t *ma #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 -puN net/ipv4/netfilter/ip_tables.c~remove-for_each_cpu net/ipv4/netfilter/ip_tables.c --- devel/net/ipv4/netfilter/ip_tables.c~remove-for_each_cpu 2006-04-22 01:37:13.000000000 -0700 +++ devel-akpm/net/ipv4/netfilter/ip_tables.c 2006-04-22 01:37:13.000000000 -0700 @@ -1766,7 +1766,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); _