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>
---
arch/powerpc/Kconfig | 1 +
arch/sparc64/Kconfig | 1 +
arch/x86/Kconfig | 1 +
kernel/trace/Kconfig | 4 ++++
4 files changed, 7 insertions(+)
Index: linux-tip.git/arch/powerpc/Kconfig
===================================================================
--- linux-tip.git.orig/arch/powerpc/Kconfig 2008-05-16 20:26:20.000000000 -0700
+++ linux-tip.git/arch/powerpc/Kconfig 2008-05-16 20:27:47.000000000 -0700
@@ -107,6 +107,7 @@ config PPC
default y
select HAVE_IDE
select HAVE_IMMEDIATE
+ select HAVE_DYNAMIC_FTRACE
select HAVE_FTRACE
select HAVE_KPROBES
select HAVE_KRETPROBES
Index: linux-tip.git/arch/sparc64/Kconfig
===================================================================
--- linux-tip.git.orig/arch/sparc64/Kconfig 2008-05-16 20:26:20.000000000 -0700
+++ linux-tip.git/arch/sparc64/Kconfig 2008-05-16 20:27:24.000000000 -0700
@@ -11,6 +11,7 @@ config SPARC
config SPARC64
bool
default y
+ select HAVE_DYNAMIC_FTRACE
select HAVE_FTRACE
select HAVE_IDE
select HAVE_LMB
Index: linux-tip.git/arch/x86/Kconfig
===================================================================
--- linux-tip.git.orig/arch/x86/Kconfig 2008-05-16 20:26:20.000000000 -0700
+++ linux-tip.git/arch/x86/Kconfig 2008-05-16 20:27:32.000000000 -0700
@@ -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
Index: linux-tip.git/kernel/trace/Kconfig
===================================================================
--- linux-tip.git.orig/kernel/trace/Kconfig 2008-05-16 20:28:11.000000000 -0700
+++ linux-tip.git/kernel/trace/Kconfig 2008-05-16 20:35:07.000000000 -0700
@@ -4,6 +4,9 @@
config HAVE_FTRACE
bool
+config HAVE_DYNAMIC_FTRACE
+ bool
+
config TRACER_MAX_TRACE
bool
@@ -102,6 +105,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
--
