Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu updates from Tejun Heo: "Nothing interesting. A patch to convert the remaining __get_cpu_var() users, another to fix non-critical off-by-one in an assertion and a cosmetic conversion to lockless_dereference() in percpu-ref. The back-merge from mainline is to receive lockless_dereference()" * 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: Replace smp_read_barrier_depends() with lockless_dereference() percpu: Convert remaining __get_cpu_var uses in 3.18-rcX percpu: off by one in BUG_ON()
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
/*
|
||||
|
@@ -235,7 +235,7 @@ void tick_nohz_full_kick(void)
|
||||
if (!tick_nohz_full_cpu(smp_processor_id()))
|
||||
return;
|
||||
|
||||
irq_work_queue(&__get_cpu_var(nohz_full_kick_work));
|
||||
irq_work_queue(this_cpu_ptr(&nohz_full_kick_work));
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user