Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu updates from Tejun Heo:
 "Contains Alex Shi's three patches to remove percpu_xxx() which overlap
  with this_cpu_xxx().  There shouldn't be any functional change."

* 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: remove percpu_xxx() functions
  x86: replace percpu_xxx funcs with this_cpu_xxx
  net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx

2 files changed, 8 insertions, 8 deletions

diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index 4d5057902839..ee2e5bc5a8c7 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -87,7 +87,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
         const struct xt_tee_tginfo *info = par->targinfo;
         struct iphdr *iph;
 
-        if (percpu_read(tee_active))
+        if (__this_cpu_read(tee_active))
                 return XT_CONTINUE;
         /*
          * Copy the skb, and route the copy. Will later return %XT_CONTINUE for
@@ -124,9 +124,9 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
         ip_send_check(iph);
 
         if (tee_tg_route4(skb, info)) {
-                percpu_write(tee_active, true);
+                __this_cpu_write(tee_active, true);
                 ip_local_out(skb);
-                percpu_write(tee_active, false);
+                __this_cpu_write(tee_active, false);
         } else {
                 kfree_skb(skb);
         }
@@ -168,7 +168,7 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
 {
         const struct xt_tee_tginfo *info = par->targinfo;
 
-        if (percpu_read(tee_active))
+        if (__this_cpu_read(tee_active))
                 return XT_CONTINUE;
         skb = pskb_copy(skb, GFP_ATOMIC);
         if (skb == NULL)
@@ -186,9 +186,9 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
                 --iph->hop_limit;
         }
         if (tee_tg_route6(skb, info)) {
-                percpu_write(tee_active, true);
+                __this_cpu_write(tee_active, true);
                 ip6_local_out(skb);
-                percpu_write(tee_active, false);
+                __this_cpu_write(tee_active, false);
         } else {
                 kfree_skb(skb);
         }
diff --git a/net/socket.c b/net/socket.c
index 2a2898ce596e..6e0ccc09b313 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -479,7 +479,7 @@ static struct socket *sock_alloc(void)
         inode->i_uid = current_fsuid();
         inode->i_gid = current_fsgid();
 
-        percpu_add(sockets_in_use, 1);
+        this_cpu_add(sockets_in_use, 1);
         return sock;
 }
 
@@ -522,7 +522,7 @@ void sock_release(struct socket *sock)
         if (rcu_dereference_protected(sock->wq, 1)->fasync_list)
                 printk(KERN_ERR "sock_release: fasync list not empty!\n");
 
-        percpu_sub(sockets_in_use, 1);
+        this_cpu_sub(sockets_in_use, 1);
         if (!sock->file) {
                 iput(SOCK_INODE(sock));
                 return;