diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 15:54:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 15:54:49 -0400 |
commit | 5d70f79b5ef6ea2de4f72a37b2d96e2601e40a22 (patch) | |
tree | a0d6de0930ba83ecf4629c2e2e261f5eaa2d8f33 /lib/Kconfig.debug | |
parent | 888a6f77e0418b049f83d37547c209b904d30af4 (diff) | |
parent | 750ed158bf6c782d2813da1bca2c824365a0b777 (diff) |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (163 commits)
tracing: Fix compile issue for trace_sched_wakeup.c
[S390] hardirq: remove pointless header file includes
[IA64] Move local_softirq_pending() definition
perf, powerpc: Fix power_pmu_event_init to not use event->ctx
ftrace: Remove recursion between recordmcount and scripts/mod/empty
jump_label: Add COND_STMT(), reducer wrappery
perf: Optimize sw events
perf: Use jump_labels to optimize the scheduler hooks
jump_label: Add atomic_t interface
jump_label: Use more consistent naming
perf, hw_breakpoint: Fix crash in hw_breakpoint creation
perf: Find task before event alloc
perf: Fix task refcount bugs
perf: Fix group moving
irq_work: Add generic hardirq context callbacks
perf_events: Fix transaction recovery in group_sched_in()
perf_events: Fix bogus AMD64 generic TLB events
perf_events: Fix bogus context time tracking
tracing: Remove parent recording in latency tracer graph options
tracing: Use one prologue for the preempt irqs off tracer function tracers
...
Diffstat (limited to 'lib/Kconfig.debug')
-rw-r--r-- | lib/Kconfig.debug | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 9886cf5365ba..21ac83070a80 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -482,6 +482,7 @@ config PROVE_LOCKING | |||
482 | select DEBUG_SPINLOCK | 482 | select DEBUG_SPINLOCK |
483 | select DEBUG_MUTEXES | 483 | select DEBUG_MUTEXES |
484 | select DEBUG_LOCK_ALLOC | 484 | select DEBUG_LOCK_ALLOC |
485 | select TRACE_IRQFLAGS | ||
485 | default n | 486 | default n |
486 | help | 487 | help |
487 | This feature enables the kernel to prove that all locking | 488 | This feature enables the kernel to prove that all locking |
@@ -596,11 +597,10 @@ config DEBUG_LOCKDEP | |||
596 | of more runtime overhead. | 597 | of more runtime overhead. |
597 | 598 | ||
598 | config TRACE_IRQFLAGS | 599 | config TRACE_IRQFLAGS |
599 | depends on DEBUG_KERNEL | ||
600 | bool | 600 | bool |
601 | default y | 601 | help |
602 | depends on TRACE_IRQFLAGS_SUPPORT | 602 | Enables hooks to interrupt enabling and disabling for |
603 | depends on PROVE_LOCKING | 603 | either tracing or lock debugging. |
604 | 604 | ||
605 | config DEBUG_SPINLOCK_SLEEP | 605 | config DEBUG_SPINLOCK_SLEEP |
606 | bool "Spinlock debugging: sleep-inside-spinlock checking" | 606 | bool "Spinlock debugging: sleep-inside-spinlock checking" |