aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2011-06-08 13:31:56 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2011-06-22 18:44:38 -0400
commitd902db1eb60387040fe541573083e47469db50ac (patch)
treeea50ea75522a9a17af04d578a36a9e585e78464b /kernel/sched.c
parente8f7c70f44f75c827c04239b0ae5f0068b65b76e (diff)
sched: Generalize sleep inside spinlock detection
The sleeping inside spinlock detection is actually used for more general sleeping inside atomic sections debugging: preemption disabled, rcu read side critical sections, interrupts, interrupt disabled, etc... Change the name of the config and its help section to reflect its more general role. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 90ad7cf2b29..a5f318b8d65 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8018,7 +8018,7 @@ void __init sched_init(void)
8018 scheduler_running = 1; 8018 scheduler_running = 1;
8019} 8019}
8020 8020
8021#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP 8021#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
8022static inline int preempt_count_equals(int preempt_offset) 8022static inline int preempt_count_equals(int preempt_offset)
8023{ 8023{
8024 int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth(); 8024 int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth();