---

yaml --- r: 189071 b: refs/heads/master c: 0cff810 h: refs/heads/master i: 189069: 2e588f6 189067: bab7695 189063: 33e6480 189055: a85d903 v: v3
git-mirror · Mar 18, 2010 · bc25b3d · bc25b3d
1 parent bfd5b3d
commit bc25b3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f5b774275df8c76a959eae7488128b637fcbfc8
+refs/heads/master: 0cff810f54b3b52075c27f7a7021d5b195264b6c
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
@@ -149,7 +149,7 @@ static inline int rcu_read_lock_sched_held(void)
 		return 1;
 	if (debug_locks)
 		lockdep_opinion = lock_is_held(&rcu_sched_lock_map);
-	return lockdep_opinion || preempt_count() != 0;
+	return lockdep_opinion || preempt_count() != 0 || irqs_disabled();
 }
 #else /* #ifdef CONFIG_PREEMPT */
 static inline int rcu_read_lock_sched_held(void)
@@ -180,7 +180,7 @@ static inline int rcu_read_lock_bh_held(void)
 #ifdef CONFIG_PREEMPT
 static inline int rcu_read_lock_sched_held(void)
 {
-	return !rcu_scheduler_active || preempt_count() != 0;
+	return !rcu_scheduler_active || preempt_count() != 0 || irqs_disabled();
 }
 #else /* #ifdef CONFIG_PREEMPT */
 static inline int rcu_read_lock_sched_held(void)