Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 78a35e9..beea3cc 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -30,6 +30,18 @@ config OPROFILE_IBS
 
          If unsure, say N.
 
+config OPROFILE_EVENT_MULTIPLEX
+       bool "OProfile multiplexing support (EXPERIMENTAL)"
+       default n
+       depends on OPROFILE && X86
+       help
+         The number of hardware counters is limited. The multiplexing
+         feature enables OProfile to gather more events than counters
+         are provided by the hardware. This is realized by switching
+         between events at an user specified time interval.
+
+         If unsure, say N.
+
 config HAVE_OPROFILE
        bool
 
@@ -112,3 +124,5 @@ config HAVE_DMA_API_DEBUG
 
 config HAVE_DEFAULT_NO_SPIN_MUTEXES
        bool
+
+source "kernel/gcov/Kconfig"