Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac59853c authored by Pranith Kumar's avatar Pranith Kumar Committed by Paul E. McKenney
Browse files

rcupdate: Replace smp_read_barrier_depends() with lockless_dereference() 



Recently lockless_dereference() was added which can be used in place of
hard-coding smp_read_barrier_depends(). The following PATCH makes the change.

Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 536fa402

include/linux/rcupdate.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -582,11 +582,11 @@ static inline void rcu_preempt_sleep_check(void) 
})

})

#define __rcu_dereference_check(p, c, space) \

#define __rcu_dereference_check(p, c, space) \

({ \

({ \

	typeof(*p) *_________p1 = (typeof(*p) *__force)ACCESS_ONCE(p); \

	/* Dependency order vs. p above. */ \

	typeof(*p) *________p1 = (typeof(*p) *__force)lockless_dereference(p); \

	rcu_lockdep_assert(c, "suspicious rcu_dereference_check() usage"); \

	rcu_lockdep_assert(c, "suspicious rcu_dereference_check() usage"); \

	rcu_dereference_sparse(p, space); \

	rcu_dereference_sparse(p, space); \

	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \

	((typeof(*p) __force __kernel *)(________p1)); \

	((typeof(*p) __force __kernel *)(_________p1)); \

})

})

#define __rcu_dereference_protected(p, c, space) \

#define __rcu_dereference_protected(p, c, space) \

({ \

({ \
@@ -603,10 +603,10 @@ static inline void rcu_preempt_sleep_check(void) 
})

})

#define __rcu_dereference_index_check(p, c) \

#define __rcu_dereference_index_check(p, c) \

({ \

({ \

	typeof(p) _________p1 = ACCESS_ONCE(p); \

	/* Dependency order vs. p above. */ \

	typeof(p) _________p1 = lockless_dereference(p); \

	rcu_lockdep_assert(c, \

	rcu_lockdep_assert(c, \

			   "suspicious rcu_dereference_index_check() usage"); \

			   "suspicious rcu_dereference_index_check() usage"); \

	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \

	(_________p1); \

	(_________p1); \

})

})