ftrace: add have dynamic ftrace config for archs

Now that ftrace is being ported to other architectures, it has become
apparent that DYNAMIC_FTRACE is dependent on whether or not that
architecture implements dynamic ftrace. FTRACE itself may be ported to
an architecture without porting dynamic ftrace.

This patch adds HAVE_DYNAMIC_FTRACE to allow architectures to port ftrace
without having to also port the dynamic aspect as well.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 62d034adbd433d0d89b1dff1d908e18a394fd547..a5e9912e2d3773fdab23a4bc52ec5e147f47e1cf 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -105,6 +105,7 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
        bool
        default y
+       select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE
        select HAVE_IDE
        select HAVE_KPROBES

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a480df6e60124916a1f7a03f1fd0cfde48e915b8..fca9246470b11e3beb0be6e6fe1ba65c1e7a183b 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,6 +11,7 @@ config SPARC
 config SPARC64
        bool
        default y
+       select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE
        select HAVE_IDE
        select HAVE_LMB

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c742dfeb0dbe8300f76021c745f088413470b62b..fc86c54e791ec848360b7ef9fa2de802b53ceeae 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -23,6 +23,7 @@ config X86
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
+       select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE
        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
        select HAVE_ARCH_KGDB if !X86_VOYAGER

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index f3005717bcd0ca3d7b4638ea92aedc8194dce636..5c2295b29f2c90504ced87871930d8950abe76ee 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -4,6 +4,9 @@
 config HAVE_FTRACE
        bool
 
+config HAVE_DYNAMIC_FTRACE
+       bool
+
 config TRACER_MAX_TRACE
        bool
 
@@ -94,6 +97,7 @@ config CONTEXT_SWITCH_TRACER
 config DYNAMIC_FTRACE
        bool "enable/disable ftrace tracepoints dynamically"
        depends on FTRACE
+       depends on HAVE_DYNAMIC_FTRACE
        default y
        help
          This option will modify all the calls to ftrace dynamically