diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-07 07:19:06 (GMT) |
|---|---|---|
| committer | Emil Medve <Emilian.Medve@Freescale.com> | 2013-04-30 08:17:08 (GMT) |
| commit | 199e15a475d952f3716681780d4deecd3b7b310a (patch) | |
| tree | f754913d1d18d922e17d998f7f5af49eba5d75da /kernel/sched | |
| parent | 57b370130892062eb0074a0e0dc3feee98f758d9 (diff) | |
| download | linux-fsl-qoriq-199e15a475d952f3716681780d4deecd3b7b310a.tar.xz | |
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 1cd82b7..f5bf3e8 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7060,7 +7060,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); } |