aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2009-08-25 21:53:37 -0400
committerIngo Molnar <mingo@elte.hu>2009-08-26 03:45:41 -0400
commit06e799764eb7c2e4640888d438c3524d756613e1 (patch)
tree6c5437a498113c41cacc92d896c99afd5e5091ae /include/linux
parentc935a331c8f569c7903ed26a3994a70cbea1802e (diff)
rcu: Remove lockdep annotations from RCU's _notrace() API members
The lockdep annotations rcu_read_acquire() and rcu_read_release() might lead to infinite looping if called from lockdep. So this patch removes them. Formal repost of http://lkml.org/lkml/2009/8/25/309 on the strength of Lai Jiangshan's review. Suggested-by: Lai Jiangshan <laijs@cn.fujitsu.com> Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Reviewed-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: josht@linux.vnet.ibm.com Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org LKML-Reference: <20090826015337.GA18904@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/rcupdate.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 8b4422c558da..95e0615f4d75 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -195,7 +195,6 @@ static inline notrace void rcu_read_lock_sched_notrace(void)
195{ 195{
196 preempt_disable_notrace(); 196 preempt_disable_notrace();
197 __acquire(RCU_SCHED); 197 __acquire(RCU_SCHED);
198 rcu_read_acquire();
199} 198}
200 199
201/* 200/*
@@ -211,7 +210,6 @@ static inline void rcu_read_unlock_sched(void)
211} 210}
212static inline notrace void rcu_read_unlock_sched_notrace(void) 211static inline notrace void rcu_read_unlock_sched_notrace(void)
213{ 212{
214 rcu_read_release();
215 __release(RCU_SCHED); 213 __release(RCU_SCHED);
216 preempt_enable_notrace(); 214 preempt_enable_notrace();
217} 215}