diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:45:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:45:02 -0700 |
| commit | bdc7ccfc0631797636837b10df7f87bc1e2e4ae3 (patch) | |
| tree | 70f09f8ffee07486d41ca254b8abb05692713d1e /lib | |
| parent | 4d4abdcb1dee03a4f9d6d2021622ed07e14dfd17 (diff) | |
| parent | 0f3171438fc917b9f6b8b60dbb7a3fff9a0f68fd (diff) | |
| download | linux-stable-bdc7ccfc0631797636837b10df7f87bc1e2e4ae3.tar.gz linux-stable-bdc7ccfc0631797636837b10df7f87bc1e2e4ae3.tar.bz2 linux-stable-bdc7ccfc0631797636837b10df7f87bc1e2e4ae3.zip | |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
sched: Replace use of entity_key()
sched: Separate group-scheduling code more clearly
sched: Reorder root_domain to remove 64 bit alignment padding
sched: Do not attempt to destroy uninitialized rt_bandwidth
sched: Remove unused function cpu_cfs_rq()
sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
sched, cgroup: Optimize load_balance_fair()
sched: Don't update shares twice on on_rq parent
sched: update correct entity's runtime in check_preempt_wakeup()
xtensa: Use generic config PREEMPT definition
h8300: Use generic config PREEMPT definition
m32r: Use generic PREEMPT config
sched: Skip autogroup when looking for all rt sched groups
sched: Simplify mutex_spin_on_owner()
sched: Remove rcu_read_lock() from wake_affine()
sched: Generalize sleep inside spinlock detection
sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
sched: Isolate preempt counting in its own config option
sched: Remove pointless in_atomic() definition check
...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 9c28fa4202f8..c0cb9c4bc46d 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -648,12 +648,15 @@ config TRACE_IRQFLAGS Enables hooks to interrupt enabling and disabling for either tracing or lock debugging. -config DEBUG_SPINLOCK_SLEEP - bool "Spinlock debugging: sleep-inside-spinlock checking" +config DEBUG_ATOMIC_SLEEP + bool "Sleep inside atomic section checking" + select PREEMPT_COUNT depends on DEBUG_KERNEL help If you say Y here, various routines which may sleep will become very - noisy if they are called with a spinlock held. + noisy if they are called inside atomic sections: when a spinlock is + held, inside an rcu read side critical section, inside preempt disabled + sections, inside an interrupt, etc... config DEBUG_LOCKING_API_SELFTESTS bool "Locking API boot-time self-tests" |