From 56e4dea81a55c338eede625f715c7fa21f1a28c4 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Mon, 27 Oct 2014 10:49:45 -0500 Subject: 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 Acked-by: Will Deacon Acked-by: Thomas Gleixner Signed-off-by: Tejun Heo --- kernel/irq_work.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/irq_work.c') 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)); } /* -- cgit