summaryrefslogtreecommitdiff
path: root/kernel/irq_work.c
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-10-27 10:49:45 -0500
committerTejun Heo <tj@kernel.org>2014-10-29 11:18:18 -0400
commit56e4dea81a55c338eede625f715c7fa21f1a28c4 (patch)
tree9d2ef7f447aa3a811fc77e84c506341e5469b087 /kernel/irq_work.c
parent9f295664e2f2cdf53c596f74bcf3f644cae9fecc (diff)
downloadlinux-sh-56e4dea81a55c338eede625f715c7fa21f1a28c4.tar.gz
percpu: Convert remaining __get_cpu_var uses in 3.18-rcX
During the 3.18 merge period additional __get_cpu_var uses were added. The patch converts these to this_cpu_ptr(). Signed-off-by: Christoph Lameter <cl@linux.com> Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/irq_work.c')
-rw-r--r--kernel/irq_work.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index 3ab9048483fa..cbf9fb899d92 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -175,11 +175,11 @@ EXPORT_SYMBOL_GPL(irq_work_run);
void irq_work_tick(void)
{
- struct llist_head *raised = &__get_cpu_var(raised_list);
+ struct llist_head *raised = this_cpu_ptr(&raised_list);
if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
irq_work_run_list(raised);
- irq_work_run_list(&__get_cpu_var(lazy_list));
+ irq_work_run_list(this_cpu_ptr(&lazy_list));
}
/*