Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index beea3ccebb5e4014ea3c9556824a2d54c0423dfa..7f418bbc261a0f825ab6072f935f1f974a2f746c 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -9,6 +9,7 @@ config OPROFILE
        depends on TRACING_SUPPORT
        select TRACING
        select RING_BUFFER
+       select RING_BUFFER_ALLOW_SWAP
        help
          OProfile is a profiling system capable of profiling the
          whole system, include the kernel, kernel modules, libraries,