diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-07 07:19:06 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:32 (GMT) |
| commit | 6afb59e234ec3c4a5fc7eaf4099b296b988a61dc (patch) | |
| tree | b3020a1070fedc7733b1b9c6c2f97d236385ee9f | |
| parent | 730b065b19ac510309b0c71e5ff29843562bf594 (diff) | |
| download | linux-fsl-qoriq-6afb59e234ec3c4a5fc7eaf4099b296b988a61dc.tar.xz | |
sched-might-sleep-do-not-account-rcu-depth.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/rcupdate.h | 7 | ||||
| -rw-r--r-- | kernel/sched/core.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index f1f1bc3..e56a6b2 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -190,6 +190,11 @@ void synchronize_rcu(void); * types of kernel builds, the rcu_read_lock() nesting depth is unknowable. */ #define rcu_preempt_depth() (current->rcu_read_lock_nesting) +#ifndef CONFIG_PREEMPT_RT_FULL +#define sched_rcu_preempt_depth() rcu_preempt_depth() +#else +static inline int sched_rcu_preempt_depth(void) { return 0; } +#endif #else /* #ifdef CONFIG_PREEMPT_RCU */ @@ -213,6 +218,8 @@ static inline int rcu_preempt_depth(void) return 0; } +#define sched_rcu_preempt_depth() rcu_preempt_depth() + #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ /* Internal to kernel */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 56386af..fac1bd3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6688,7 +6688,8 @@ void __init sched_init(void) #ifdef CONFIG_DEBUG_ATOMIC_SLEEP static inline int preempt_count_equals(int preempt_offset) { - int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth(); + int nested = (preempt_count() & ~PREEMPT_ACTIVE) + + sched_rcu_preempt_depth(); return (nested == preempt_offset); } |