7 files changed, 13 insertions, 13 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 9831fd2c73a0..2a0455911ee0 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1107,7 +1107,7 @@ void __init icmp_init(struct net_proto_family *ops)
         struct inet_sock *inet;
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 int err;
 
                 err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP,
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index 0a1d86a0f632..04a429465665 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -290,7 +290,7 @@ static void ipcomp_free_scratches(void)
         if (!scratches)
                 return;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 void *scratch = *per_cpu_ptr(scratches, i);
                 if (scratch)
                         vfree(scratch);
@@ -313,7 +313,7 @@ static void **ipcomp_alloc_scratches(void)
 
         ipcomp_scratches = scratches;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
                 if (!scratch)
                         return NULL;
@@ -344,7 +344,7 @@ static void ipcomp_free_tfms(struct crypto_tfm **tfms)
         if (!tfms)
                 return;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
                 crypto_free_tfm(tfm);
         }
@@ -384,7 +384,7 @@ static struct crypto_tfm **ipcomp_alloc_tfms(const char *alg_name)
         if (!tfms)
                 goto error;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct crypto_tfm *tfm = crypto_alloc_tfm(alg_name, 0);
                 if (!tfm)
                         goto error;
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index a44a5d73457d..c2d92f99a2b8 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -646,7 +646,7 @@ static int translate_table(const char *name,
         }
 
         /* And one copy for every other CPU */
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 if (newinfo->entries[i] && newinfo->entries[i] != entry0)
                         memcpy(newinfo->entries[i], entry0, newinfo->size);
         }
@@ -696,7 +696,7 @@ static void get_counters(const struct xt_table_info *t,
                            counters,
                            &i);
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == curcpu)
                         continue;
                 i = 0;
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index ceaabc18202b..979a2eac6f00 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -133,7 +133,7 @@ static void ip_ct_event_cache_flush(void)
         struct ip_conntrack_ecache *ecache;
         int cpu;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 ecache = &per_cpu(ip_conntrack_ecache, cpu);
                 if (ecache->ct)
                         ip_conntrack_put(ecache->ct);
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index d5b8cdd361ce..d25ac8ba6eba 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -735,7 +735,7 @@ translate_table(const char *name,
         }
 
         /* And one copy for every other CPU */
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 if (newinfo->entries[i] && newinfo->entries[i] != entry0)
                         memcpy(newinfo->entries[i], entry0, newinfo->size);
         }
@@ -788,7 +788,7 @@ get_counters(const struct xt_table_info *t,
                           counters,
                           &i);
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == curcpu)
                         continue;
                 i = 0;
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 1b167c4bb3be..d61e2a9d394d 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -49,7 +49,7 @@ static int fold_prot_inuse(struct proto *proto)
         int res = 0;
         int cpu;
 
-        for_each_cpu(cpu)
+        for_each_possible_cpu(cpu)
                 res += proto->stats[cpu].inuse;
 
         return res;
@@ -91,7 +91,7 @@ fold_field(void *mib[], int offt)
         unsigned long res = 0;
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 res += *(((unsigned long *) per_cpu_ptr(mib[0], i)) + offt);
                 res += *(((unsigned long *) per_cpu_ptr(mib[1], i)) + offt);
         }
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 94fcbc5e5a1b..ff434821909f 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3083,7 +3083,7 @@ static int ip_rt_acct_read(char *buffer, char **start, off_t offset,
                 memcpy(dst, src, length);
 
                 /* Add the other cpus in, one int at a time */
-                for_each_cpu(i) {
+                for_each_possible_cpu(i) {
                         unsigned int j;
 
                         src = ((u32 *) IP_RT_ACCT_CPU(i)) + offset;