From 3d7bac9d40e26b4d4db0afd604ee5bd3b673d882 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 7 Jun 2011 09:19:06 +0200 Subject: sched-might-sleep-do-not-account-rcu-depth.patch Signed-off-by: Thomas Gleixner --- kernel/sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/sched.c b/kernel/sched.c index b8139468fda9..aa3cc029db77 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -8429,7 +8429,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); } -- cgit v1.2.3