ftrace: disable dynamic ftrace for all archs that use daemon

The ftrace daemon is complex and can cause nasty races if something goes
wrong. Since it affects all of the kernel, this patch disables dynamic
ftrace from any arch that depends on the daemon. Until the archs are
ported over to the new MCOUNT_RECORD method, I am disabling dynamic
ftrace from them.

Note: I am leaving in the arch/<arch>/kernel/ftrace.c code alone since
that can be used when the arch is ported to MCOUNT_RECORD. To port
the arch to MCOUNT_RECORD, the scripts/recordmcount.pl needs to be
updated. I will make that easier to do for 2.6.29. For 28, we will keep
the archs disabled.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 600733426ae04e33042646f41a3579965288ce2f..c5b431e231ddccae7a45240ce71374be34b7e2f3 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,7 +17,6 @@ config ARM
        select HAVE_KPROBES if (!XIP_KERNEL)
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
-       select HAVE_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER)
        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 441ce06174ff3013f2999e3d88d841616141344a..5122a67e6ffaa94ae8d2acb294f26c2cd087e5f5 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -111,7 +111,6 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
        bool
        default y
-       select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_IDE

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 824f6122e1a51f4e8b5c1d9e2028cb46f353fbf8..3b96e70b467033f43f6dc4b099bbf4e47c14a975 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,7 +11,6 @@ config SPARC
 config SPARC64
        bool
        default y
-       select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select HAVE_IDE
        select HAVE_LMB