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:
@@ -128,10 +128,8 @@ static inline void percpu_ref_kill(struct percpu_ref *ref)
|
||||
static inline bool __ref_is_percpu(struct percpu_ref *ref,
|
||||
unsigned long __percpu **percpu_countp)
|
||||
{
|
||||
unsigned long percpu_ptr = ACCESS_ONCE(ref->percpu_count_ptr);
|
||||
|
||||
/* paired with smp_store_release() in percpu_ref_reinit() */
|
||||
smp_read_barrier_depends();
|
||||
unsigned long percpu_ptr = lockless_dereference(ref->percpu_count_ptr);
|
||||
|
||||
/*
|
||||
* Theoretically, the following could test just ATOMIC; however,
|
||||
|
Reference in New Issue
Block a user