diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 12:49:59 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 12:49:59 -0700 |
| commit | 252997330908cb8ee3d5714539ed967b977c2eae (patch) | |
| tree | 627395514c622dc6eb51ae3a2a5bbebddc788299 /kernel/rcupdate.c | |
| parent | 25e03a74e4a14e0d52a66fb56c728f049a6a26d3 (diff) | |
| parent | 5c173eb8bcb9c1aa888bd6d14a4cb746f3dd2420 (diff) | |
Merge branch 'idle.2013.09.25a' into HEAD
idle.2013.09.25a: Topic branch for idle entry-/exit-related changes.
Diffstat (limited to 'kernel/rcupdate.c')
| -rw-r--r-- | kernel/rcupdate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 3260a1074b48..c07af1c4e1bb 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c @@ -148,7 +148,7 @@ int rcu_read_lock_bh_held(void) { if (!debug_lockdep_rcu_enabled()) return 1; - if (rcu_is_cpu_idle()) + if (!rcu_is_watching()) return 0; if (!rcu_lockdep_current_cpu_online()) return 0; |