diff options
author | Christoph Lameter <cl@linux.com> | 2014-08-17 13:30:24 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-08-26 13:45:44 -0400 |
commit | bb964a92ce70ac2039115edd019aa5eef8faa6bb (patch) | |
tree | fd80052dab3dc9d5f3e77be30d3923bb52582c13 /kernel/printk/printk.c | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) |
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/printk.c')
-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) | |||
2628 | preempt_disable(); | 2628 | preempt_disable(); |
2629 | if (waitqueue_active(&log_wait)) { | 2629 | if (waitqueue_active(&log_wait)) { |
2630 | this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP); | 2630 | this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP); |
2631 | irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); | 2631 | irq_work_queue(this_cpu_ptr(&wake_up_klogd_work)); |
2632 | } | 2632 | } |
2633 | preempt_enable(); | 2633 | preempt_enable(); |
2634 | } | 2634 | } |
@@ -2644,7 +2644,7 @@ int printk_deferred(const char *fmt, ...) | |||
2644 | va_end(args); | 2644 | va_end(args); |
2645 | 2645 | ||
2646 | __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); | 2646 | __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); |
2647 | irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); | 2647 | irq_work_queue(this_cpu_ptr(&wake_up_klogd_work)); |
2648 | preempt_enable(); | 2648 | preempt_enable(); |
2649 | 2649 | ||
2650 | return r; | 2650 | return r; |