Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[~andy/linux] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 99193b1602324dc0ff55759cd4cd5d2e3abccdc9..beea3ccebb5e4014ea3c9556824a2d54c0423dfa 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