4 files changed, 7 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 62d034adbd43..a5e9912e2d37 100644
--- 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 a480df6e6012..fca9246470b1 100644
--- 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 c742dfeb0dbe..fc86c54e791e 100644
--- 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 f3005717bcd0..5c2295b29f2c 100644
--- 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