aboutsummaryrefslogtreecommitdiffstats
path: root/mm/zsmalloc.c
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-06-04 19:07:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 19:54:03 -0400
commit7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d (patch)
treefe5aee0e426d8f0528856bb0decb95636ff3e8a0 /mm/zsmalloc.c
parentdc6f6c97f1d3d58fef81f0f9db0c7d068b2cf392 (diff)
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>
Diffstat (limited to 'mm/zsmalloc.c')
-rw-r--r--mm/zsmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 36b4591a7a2d..5ae5d85b629d 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1082,7 +1082,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
1082 class = &pool->size_class[class_idx]; 1082 class = &pool->size_class[class_idx];
1083 off = obj_idx_to_offset(page, obj_idx, class->size); 1083 off = obj_idx_to_offset(page, obj_idx, class->size);
1084 1084
1085 area = &__get_cpu_var(zs_map_area); 1085 area = this_cpu_ptr(&zs_map_area);
1086 if (off + class->size <= PAGE_SIZE) 1086 if (off + class->size <= PAGE_SIZE)
1087 kunmap_atomic(area->vm_addr); 1087 kunmap_atomic(area->vm_addr);
1088 else { 1088 else {