The patch titled
remove for_each_cpu()
has been added to the -mm tree. Its filename is
remove-for_each_cpu.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
Convert a few stragglers over to for_each_possible_cpu(), remove
for_each_cpu().
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/acpi/boot.c | 2 +-
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/core/sock.c | 2 +-
net/ipv4/netfilter/ip_tables.c | 2 +-
8 files changed, 11 insertions(+), 12 deletions(-)
diff -puN arch/i386/kernel/acpi/boot.c~remove-for_each_cpu arch/i386/kernel/acpi/boot.c
--- devel/arch/i386/kernel/acpi/boot.c~remove-for_each_cpu 2006-04-22 01:31:53.000000000 -0700
+++ devel-akpm/arch/i386/kernel/acpi/boot.c 2006-04-22 01:31:53.000000000 -0700
@@ -565,7 +565,7 @@ int acpi_unmap_lsapic(int cpu)
{
int i;
- for_each_cpu(i) {
+ for_each_possible_cpu(i) {
if (x86_acpiid_to_apicid[i] == x86_cpu_to_apicid[cpu]) {
x86_acpiid_to_apicid[i] = -1;
break;
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:31:53.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-04-22 01:31:53.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:31:53.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-04-22 01:31:53.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:31:53.000000000 -0700
+++ devel-akpm/arch/ia64/kernel/topology.c 2006-04-22 01:31:53.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:31:53.000000000 -0700
+++ devel-akpm/arch/powerpc/platforms/cell/interrupt.c 2006-04-22 01:31:53.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:31:53.000000000 -0700
+++ devel-akpm/include/linux/cpumask.h 2006-04-22 01:31:53.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/core/sock.c~remove-for_each_cpu net/core/sock.c
--- devel/net/core/sock.c~remove-for_each_cpu 2006-04-22 01:31:53.000000000 -0700
+++ devel-akpm/net/core/sock.c 2006-04-22 01:31:53.000000000 -0700
@@ -1591,7 +1591,7 @@ int read_sockets_allocated(struct proto
{
int total = 0;
int cpu;
- for_each_cpu(cpu)
+ for_each_possible_cpu(cpu)
total += *per_cpu_ptr(prot->sockets_allocated, cpu);
return total;
}
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:31:53.000000000 -0700
+++ devel-akpm/net/ipv4/netfilter/ip_tables.c 2006-04-22 01:31:53.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);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
config_net=n-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
sony_apci-resume.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
dvb-core-ule-fixes-and-rfc4326-additions-kernel-2616-tidy.patch
sparc32-vivi-fix.patch
git-dvb-compat-build-fix.patch
bt866-build-fix.patch
connector-exports.patch
opencores-i2c-bus-driver-tidy.patch
git-libata-all.patch
git-mtd.patch
pci-error-recovery-e1000-network-device-driver.patch
powerpc-pseries-avoid-crash-in-pci-code-if-mem-system-not-up-tidy.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
git-pcmcia.patch
git-scsi-misc.patch
megaraid-unused-variable.patch
enable-advansys-driver.patch
advansys-warning-workaround.patch
scsi-clean-up-warnings-in-advansys-driver-fix.patch
fix-sco-on-some-bluetooth-adapters-tidy.patch
git-watchdog.patch
pg_uncached-is-ia64-only.patch
migration-remove-unnecessary-pageswapcache-checks-fix.patch
wait_table-and-zonelist-initializing-for-memory-hotadd-wait_table-initialization-fixes.patch
preserve-write-permissions-in-migration-entries-fix.patch
read-write-migration-entries-make-mprotect-convert-write-migration-fix.patch
read-write-migration-entries-make-mprotect-convert-write-migration-fix-fix.patch
read-write-migration-entries-make-mprotect-convert-write-migration-fix-fix-fix.patch
slab-cleanup-kmem_getpages-fix.patch
slab-stop-using-list_for_each-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
mm-introduce-remap_vmalloc_range-fix.patch
acx1xx-wireless-driver.patch
x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
tpm-use-clear_bit-fix.patch
tpm-use-clear_bit-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
remove-for_each_cpu.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
