|
@@ -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)
|