aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/rcupdate.h6
-rw-r--r--include/linux/srcu.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 70b896e16f19..416ae2848c6c 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -729,7 +729,7 @@ static inline void rcu_preempt_sleep_check(void)
729 * annotated as __rcu. 729 * annotated as __rcu.
730 */ 730 */
731#define rcu_dereference_check(p, c) \ 731#define rcu_dereference_check(p, c) \
732 __rcu_dereference_check((p), rcu_read_lock_held() || (c), __rcu) 732 __rcu_dereference_check((p), (c) || rcu_read_lock_held(), __rcu)
733 733
734/** 734/**
735 * rcu_dereference_bh_check() - rcu_dereference_bh with debug checking 735 * rcu_dereference_bh_check() - rcu_dereference_bh with debug checking
@@ -739,7 +739,7 @@ static inline void rcu_preempt_sleep_check(void)
739 * This is the RCU-bh counterpart to rcu_dereference_check(). 739 * This is the RCU-bh counterpart to rcu_dereference_check().
740 */ 740 */
741#define rcu_dereference_bh_check(p, c) \ 741#define rcu_dereference_bh_check(p, c) \
742 __rcu_dereference_check((p), rcu_read_lock_bh_held() || (c), __rcu) 742 __rcu_dereference_check((p), (c) || rcu_read_lock_bh_held(), __rcu)
743 743
744/** 744/**
745 * rcu_dereference_sched_check() - rcu_dereference_sched with debug checking 745 * rcu_dereference_sched_check() - rcu_dereference_sched with debug checking
@@ -749,7 +749,7 @@ static inline void rcu_preempt_sleep_check(void)
749 * This is the RCU-sched counterpart to rcu_dereference_check(). 749 * This is the RCU-sched counterpart to rcu_dereference_check().
750 */ 750 */
751#define rcu_dereference_sched_check(p, c) \ 751#define rcu_dereference_sched_check(p, c) \
752 __rcu_dereference_check((p), rcu_read_lock_sched_held() || (c), \ 752 __rcu_dereference_check((p), (c) || rcu_read_lock_sched_held(), \
753 __rcu) 753 __rcu)
754 754
755#define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /*@@@ needed? @@@*/ 755#define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /*@@@ needed? @@@*/
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 9cfd9623fb03..bdeb4567b71e 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -182,7 +182,7 @@ static inline int srcu_read_lock_held(struct srcu_struct *sp)
182 * lockdep_is_held() calls. 182 * lockdep_is_held() calls.
183 */ 183 */
184#define srcu_dereference_check(p, sp, c) \ 184#define srcu_dereference_check(p, sp, c) \
185 __rcu_dereference_check((p), srcu_read_lock_held(sp) || (c), __rcu) 185 __rcu_dereference_check((p), (c) || srcu_read_lock_held(sp), __rcu)
186 186
187/** 187/**
188 * srcu_dereference - fetch SRCU-protected pointer for later dereferencing 188 * srcu_dereference - fetch SRCU-protected pointer for later dereferencing