diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-07 09:19:06 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-24 21:44:56 -0400 |
| commit | 636789517d476c62f480f85e4796156f96caeed4 (patch) | |
| tree | af2ad15580ed6869d89de0e6481e58b79938c355 /kernel/sched | |
| parent | 8ec0c82702e9384399c5c8295f721a24f21934a2 (diff) | |
| download | linux-rt-636789517d476c62f480f85e4796156f96caeed4.tar.gz | |
sched-might-sleep-do-not-account-rcu-depth.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 44be15aca67c..34247ee2af9f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6689,7 +6689,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); } |