[tip:core/rcu] rcu: Remove lockdep annotations from RCU's _notrace() API members

From: tip-bot for Paul E. McKenney
Date: Wed Aug 26 2009 - 04:16:45 EST


Commit-ID: 06e799764eb7c2e4640888d438c3524d756613e1
Gitweb: http://git.kernel.org/tip/06e799764eb7c2e4640888d438c3524d756613e1
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
AuthorDate: Tue, 25 Aug 2009 18:53:37 -0700
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 26 Aug 2009 09:45:41 +0200

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@xxxxxxxxxxxxxx>
Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Reviewed-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: dipankar@xxxxxxxxxx
Cc: akpm@xxxxxxxxxxxxxxxxxxxx
Cc: josht@xxxxxxxxxxxxxxxxxx
Cc: dvhltc@xxxxxxxxxx
Cc: niv@xxxxxxxxxx
Cc: peterz@xxxxxxxxxxxxx
Cc: rostedt@xxxxxxxxxxx
LKML-Reference: <20090826015337.GA18904@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
include/linux/rcupdate.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 8b4422c..95e0615 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)
{
preempt_disable_notrace();
__acquire(RCU_SCHED);
- rcu_read_acquire();
}

/*
@@ -211,7 +210,6 @@ static inline void rcu_read_unlock_sched(void)
}
static inline notrace void rcu_read_unlock_sched_notrace(void)
{
- rcu_read_release();
__release(RCU_SCHED);
preempt_enable_notrace();
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/