mm: replace __get_cpu_var uses with this_cpu_ptr

Replace places where __get_cpu_var() is used for an address calculation
with this_cpu_ptr().

Signed-off-by: Christoph Lameter <cl@linux.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 9599aa72d7a0..55f7a9c27312 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -194,7 +194,7 @@ radix_tree_node_alloc(struct radix_tree_root *root)
                  * succeed in getting a node here (and never reach
                  * kmem_cache_alloc)
                  */
-                rtp = &__get_cpu_var(radix_tree_preloads);
+                rtp = this_cpu_ptr(&radix_tree_preloads);
                 if (rtp->nr) {
                         ret = rtp->nodes[rtp->nr - 1];
                         rtp->nodes[rtp->nr - 1] = NULL;
@@ -250,14 +250,14 @@ static int __radix_tree_preload(gfp_t gfp_mask)
         int ret = -ENOMEM;
 
         preempt_disable();
-        rtp = &__get_cpu_var(radix_tree_preloads);
+        rtp = this_cpu_ptr(&radix_tree_preloads);
         while (rtp->nr < ARRAY_SIZE(rtp->nodes)) {
                 preempt_enable();
                 node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
                 if (node == NULL)
                         goto out;
                 preempt_disable();
-                rtp = &__get_cpu_var(radix_tree_preloads);
+                rtp = this_cpu_ptr(&radix_tree_preloads);
                 if (rtp->nr < ARRAY_SIZE(rtp->nodes))
                         rtp->nodes[rtp->nr++] = node;
                 else