diff options
| author | Christoph Lameter | 2014-06-05 01:07:56 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-05 01:54:03 +0200 |
| commit | 7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d (patch) | |
| tree | fe5aee0e426d8f0528856bb0decb95636ff3e8a0 /mm/slub.c | |
| parent | memcg: kill start_kernel()->mm_init_owner(&init_mm) (diff) | |
| download | kernel-qcow2-linux-7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d.tar.gz kernel-qcow2-linux-7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d.tar.xz kernel-qcow2-linux-7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d.zip | |
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/slub.c')
| -rw-r--r-- | mm/slub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c index 9e288d7c5e6a..fdf0fe4da9a9 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2209,7 +2209,7 @@ static inline void *new_slab_objects(struct kmem_cache *s, gfp_t flags, page = new_slab(s, flags, node); if (page) { - c = __this_cpu_ptr(s->cpu_slab); + c = raw_cpu_ptr(s->cpu_slab); if (c->page) flush_slab(s, c); @@ -2425,7 +2425,7 @@ redo: * and the retrieval of the tid. */ preempt_disable(); - c = __this_cpu_ptr(s->cpu_slab); + c = this_cpu_ptr(s->cpu_slab); /* * The transaction ids are globally unique per cpu and per operation on @@ -2681,7 +2681,7 @@ redo: * during the cmpxchg then the free will succedd. */ preempt_disable(); - c = __this_cpu_ptr(s->cpu_slab); + c = this_cpu_ptr(s->cpu_slab); tid = c->tid; preempt_enable(); |