diff options
author | Christoph Lameter <cl@linux.com> | 2014-06-04 19:07:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:03 -0400 |
commit | 7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d (patch) | |
tree | fe5aee0e426d8f0528856bb0decb95636ff3e8a0 /mm/memory-failure.c | |
parent | dc6f6c97f1d3d58fef81f0f9db0c7d068b2cf392 (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/memory-failure.c')
-rw-r--r-- | mm/memory-failure.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 6917f799412b..d50f17fb9be2 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
@@ -1298,7 +1298,7 @@ static void memory_failure_work_func(struct work_struct *work) | |||
1298 | unsigned long proc_flags; | 1298 | unsigned long proc_flags; |
1299 | int gotten; | 1299 | int gotten; |
1300 | 1300 | ||
1301 | mf_cpu = &__get_cpu_var(memory_failure_cpu); | 1301 | mf_cpu = this_cpu_ptr(&memory_failure_cpu); |
1302 | for (;;) { | 1302 | for (;;) { |
1303 | spin_lock_irqsave(&mf_cpu->lock, proc_flags); | 1303 | spin_lock_irqsave(&mf_cpu->lock, proc_flags); |
1304 | gotten = kfifo_get(&mf_cpu->fifo, &entry); | 1304 | gotten = kfifo_get(&mf_cpu->fifo, &entry); |