diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2011-06-08 19:31:56 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2011-06-23 00:44:38 +0200 |
| commit | d902db1eb60387040fe541573083e47469db50ac (patch) | |
| tree | ea50ea75522a9a17af04d578a36a9e585e78464b /kernel | |
| parent | e8f7c70f44f75c827c04239b0ae5f0068b65b76e (diff) | |
| download | linux-stable-d902db1eb60387040fe541573083e47469db50ac.tar.gz linux-stable-d902db1eb60387040fe541573083e47469db50ac.tar.bz2 linux-stable-d902db1eb60387040fe541573083e47469db50ac.zip | |
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')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 90ad7cf2b290..a5f318b8d659 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -8018,7 +8018,7 @@ void __init sched_init(void) scheduler_running = 1; } -#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP +#ifdef CONFIG_DEBUG_ATOMIC_SLEEP static inline int preempt_count_equals(int preempt_offset) { int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth(); |