Merge ../bleed-2.6

1 files changed, 1 insertions, 4 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 90dca711ac9f..175e093ec564 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1108,12 +1108,9 @@ void __init icmp_init(struct net_proto_family *ops)
         struct inet_sock *inet;
         int i;
 
-        for (i = 0; i < NR_CPUS; i++) {
+        for_each_cpu(i) {
                 int err;
 
-                if (!cpu_possible(i))
-                        continue;
-
                 err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP,
                                        &per_cpu(__icmp_socket, i));