summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-05-17 00:01:36 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 22:49:18 +0200
commit677aa9f77e8de3791b481a0cec6c8b84d1eec626 (patch)
tree4a3cdc6b1653231af31f045dcbaebb806a04d78d
parent7fa09f24b477ad41b821713eba757b3aa7a2864a (diff)
downloadkernel-crypto-677aa9f77e8de3791b481a0cec6c8b84d1eec626.tar.gz
kernel-crypto-677aa9f77e8de3791b481a0cec6c8b84d1eec626.tar.xz
kernel-crypto-677aa9f77e8de3791b481a0cec6c8b84d1eec626.zip
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>
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/sparc64/Kconfig1
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--kernel/trace/Kconfig4
4 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 62d034adbd4..a5e9912e2d3 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 a480df6e601..fca9246470b 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 c742dfeb0db..fc86c54e791 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 f3005717bcd..5c2295b29f2 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