diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-11-05 16:03:17 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-11-05 16:03:17 -0500 |
| commit | 44847da1b921f35b348ecd46df93abfbcd547355 (patch) | |
| tree | 0dcc929a02b98dcf0927b9ad70083087c6d0e4ae /kernel/rcupdate.c | |
| parent | ab4ead02ec235d706d0611d8741964628291237e (diff) | |
| parent | 5c173eb8bcb9c1aa888bd6d14a4cb746f3dd2420 (diff) | |
Merge branch 'idle.2013.09.25a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into HEAD
Need to use Paul McKenney's "rcu_is_watching()" changes to fix
a perf/ftrace bug.
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 b02a339836b4..3b3c0464d1eb 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
| @@ -148,7 +148,7 @@ int rcu_read_lock_bh_held(void) | |||
| 148 | { | 148 | { |
| 149 | if (!debug_lockdep_rcu_enabled()) | 149 | if (!debug_lockdep_rcu_enabled()) |
| 150 | return 1; | 150 | return 1; |
| 151 | if (rcu_is_cpu_idle()) | 151 | if (!rcu_is_watching()) |
| 152 | return 0; | 152 | return 0; |
| 153 | if (!rcu_lockdep_current_cpu_online()) | 153 | if (!rcu_lockdep_current_cpu_online()) |
| 154 | return 0; | 154 | return 0; |