Merge tag 'kvm-ppc-next-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulu...

[linux-2.6-microblaze.git] / net / ipv6 / icmp.c

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index bbcdfd2..802faa2 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -81,7 +81,7 @@
  */
 static inline struct sock *icmpv6_sk(struct net *net)
 {
-       return net->ipv6.icmp_sk[smp_processor_id()];
+       return *this_cpu_ptr(net->ipv6.icmp_sk);
 }
 
 static int icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -953,13 +953,21 @@ void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6,
        security_sk_classify_flow(sk, flowi6_to_flowi(fl6));
 }
 
+static void __net_exit icmpv6_sk_exit(struct net *net)
+{
+       int i;
+
+       for_each_possible_cpu(i)
+               inet_ctl_sock_destroy(*per_cpu_ptr(net->ipv6.icmp_sk, i));
+       free_percpu(net->ipv6.icmp_sk);
+}
+
 static int __net_init icmpv6_sk_init(struct net *net)
 {
        struct sock *sk;
-       int err, i, j;
+       int err, i;
 
-       net->ipv6.icmp_sk =
-               kcalloc(nr_cpu_ids, sizeof(struct sock *), GFP_KERNEL);
+       net->ipv6.icmp_sk = alloc_percpu(struct sock *);
        if (!net->ipv6.icmp_sk)
                return -ENOMEM;
 
@@ -972,7 +980,7 @@ static int __net_init icmpv6_sk_init(struct net *net)
                        goto fail;
                }
 
-               net->ipv6.icmp_sk[i] = sk;
+               *per_cpu_ptr(net->ipv6.icmp_sk, i) = sk;
 
                /* Enough space for 2 64K ICMP packets, including
                 * sk_buff struct overhead.
@@ -982,22 +990,10 @@ static int __net_init icmpv6_sk_init(struct net *net)
        return 0;
 
  fail:
-       for (j = 0; j < i; j++)
-               inet_ctl_sock_destroy(net->ipv6.icmp_sk[j]);
-       kfree(net->ipv6.icmp_sk);
+       icmpv6_sk_exit(net);
        return err;
 }
 
-static void __net_exit icmpv6_sk_exit(struct net *net)
-{
-       int i;
-
-       for_each_possible_cpu(i) {
-               inet_ctl_sock_destroy(net->ipv6.icmp_sk[i]);
-       }
-       kfree(net->ipv6.icmp_sk);
-}
-
 static struct pernet_operations icmpv6_sk_ops = {
        .init = icmpv6_sk_init,
        .exit = icmpv6_sk_exit,