diff options
author | Christoph Lameter <cl@linux.com> | 2014-08-17 12:30:24 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-08-26 13:45:44 -0400 |
commit | bb964a92ce70ac2039115edd019aa5eef8faa6bb (patch) | |
tree | fd80052dab3dc9d5f3e77be30d3923bb52582c13 /kernel/printk | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
download | linux-stable-bb964a92ce70ac2039115edd019aa5eef8faa6bb.tar.gz linux-stable-bb964a92ce70ac2039115edd019aa5eef8faa6bb.tar.bz2 linux-stable-bb964a92ce70ac2039115edd019aa5eef8faa6bb.zip |
kernel misc: Replace __get_cpu_var uses
Replace uses of __get_cpu_var for address calculation with this_cpu_ptr.
Cc: akpm@linux-foundation.org
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/printk')
-rw-r--r-- | kernel/printk/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index e04c455a0e38..960fbfc6cd0a 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2628,7 +2628,7 @@ void wake_up_klogd(void) preempt_disable(); if (waitqueue_active(&log_wait)) { this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP); - irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); + irq_work_queue(this_cpu_ptr(&wake_up_klogd_work)); } preempt_enable(); } @@ -2644,7 +2644,7 @@ int printk_deferred(const char *fmt, ...) va_end(args); __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); - irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); + irq_work_queue(this_cpu_ptr(&wake_up_klogd_work)); preempt_enable(); return r; |