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 /kernel/sched | |
| 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>
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 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); } |