diff options
Diffstat (limited to 'include/linux/rcupdate.h')
-rw-r--r-- | include/linux/rcupdate.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 6fe0363724e9..3ebd0b7bcb08 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
@@ -77,7 +77,7 @@ extern int rcu_scheduler_active; | |||
77 | #error "Unknown RCU implementation specified to kernel configuration" | 77 | #error "Unknown RCU implementation specified to kernel configuration" |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | #define RCU_HEAD_INIT { .next = NULL, .func = NULL } | 80 | #define RCU_HEAD_INIT { .next = NULL, .func = NULL } |
81 | #define RCU_HEAD(head) struct rcu_head head = RCU_HEAD_INIT | 81 | #define RCU_HEAD(head) struct rcu_head head = RCU_HEAD_INIT |
82 | #define INIT_RCU_HEAD(ptr) do { \ | 82 | #define INIT_RCU_HEAD(ptr) do { \ |
83 | (ptr)->next = NULL; (ptr)->func = NULL; \ | 83 | (ptr)->next = NULL; (ptr)->func = NULL; \ |
@@ -129,12 +129,6 @@ static inline void rcu_read_lock(void) | |||
129 | rcu_read_acquire(); | 129 | rcu_read_acquire(); |
130 | } | 130 | } |
131 | 131 | ||
132 | /** | ||
133 | * rcu_read_unlock - marks the end of an RCU read-side critical section. | ||
134 | * | ||
135 | * See rcu_read_lock() for more information. | ||
136 | */ | ||
137 | |||
138 | /* | 132 | /* |
139 | * So where is rcu_write_lock()? It does not exist, as there is no | 133 | * So where is rcu_write_lock()? It does not exist, as there is no |
140 | * way for writers to lock out RCU readers. This is a feature, not | 134 | * way for writers to lock out RCU readers. This is a feature, not |
@@ -144,6 +138,12 @@ static inline void rcu_read_lock(void) | |||
144 | * used as well. RCU does not care how the writers keep out of each | 138 | * used as well. RCU does not care how the writers keep out of each |
145 | * others' way, as long as they do so. | 139 | * others' way, as long as they do so. |
146 | */ | 140 | */ |
141 | |||
142 | /** | ||
143 | * rcu_read_unlock - marks the end of an RCU read-side critical section. | ||
144 | * | ||
145 | * See rcu_read_lock() for more information. | ||
146 | */ | ||
147 | static inline void rcu_read_unlock(void) | 147 | static inline void rcu_read_unlock(void) |
148 | { | 148 | { |
149 | rcu_read_release(); | 149 | rcu_read_release(); |
@@ -196,6 +196,8 @@ static inline void rcu_read_lock_sched(void) | |||
196 | __acquire(RCU_SCHED); | 196 | __acquire(RCU_SCHED); |
197 | rcu_read_acquire(); | 197 | rcu_read_acquire(); |
198 | } | 198 | } |
199 | |||
200 | /* Used by lockdep and tracing: cannot be traced, cannot call lockdep. */ | ||
199 | static inline notrace void rcu_read_lock_sched_notrace(void) | 201 | static inline notrace void rcu_read_lock_sched_notrace(void) |
200 | { | 202 | { |
201 | preempt_disable_notrace(); | 203 | preempt_disable_notrace(); |
@@ -213,6 +215,8 @@ static inline void rcu_read_unlock_sched(void) | |||
213 | __release(RCU_SCHED); | 215 | __release(RCU_SCHED); |
214 | preempt_enable(); | 216 | preempt_enable(); |
215 | } | 217 | } |
218 | |||
219 | /* Used by lockdep and tracing: cannot be traced, cannot call lockdep. */ | ||
216 | static inline notrace void rcu_read_unlock_sched_notrace(void) | 220 | static inline notrace void rcu_read_unlock_sched_notrace(void) |
217 | { | 221 | { |
218 | __release(RCU_SCHED); | 222 | __release(RCU_SCHED); |