diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-07 03:43:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-07 03:43:11 -0400 |
| commit | d4f8f217b8a5d5bd02af979650418dca4caec472 (patch) | |
| tree | af047bfa9729c975e24cb7624107574e884d3a57 /kernel/rcupdate.c | |
| parent | 2dfbf4dfbe47a484bae20456c12b40763b9b6af7 (diff) | |
| parent | 773e3f93577ffb493fb7c39b1a6ecf39b5748e87 (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
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 6c79e851521c..a23a57a976d1 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
| @@ -88,7 +88,7 @@ int rcu_read_lock_bh_held(void) | |||
| 88 | { | 88 | { |
| 89 | if (!debug_lockdep_rcu_enabled()) | 89 | if (!debug_lockdep_rcu_enabled()) |
| 90 | return 1; | 90 | return 1; |
| 91 | return in_softirq(); | 91 | return in_softirq() || irqs_disabled(); |
| 92 | } | 92 | } |
| 93 | EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held); | 93 | EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held); |
| 94 | 94 | ||