aboutsummaryrefslogtreecommitdiffstats
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 16:49:18 -0400
commit677aa9f77e8de3791b481a0cec6c8b84d1eec626 (patch)
tree4a3cdc6b1653231af31f045dcbaebb806a04d78d
parent7fa09f24b477ad41b821713eba757b3aa7a2864a (diff)
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 62d034adbd43..a5e9912e2d37 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -105,6 +105,7 @@ config ARCH_NO_VIRT_TO_BUS
105config PPC 105config PPC
106 bool 106 bool
107 default y 107 default y
108 select HAVE_DYNAMIC_FTRACE
108 select HAVE_FTRACE 109 select HAVE_FTRACE
109 select HAVE_IDE 110 select HAVE_IDE
110 select HAVE_KPROBES 111 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
11config SPARC64 11config SPARC64
12 bool 12 bool
13 default y 13 default y
14 select HAVE_DYNAMIC_FTRACE
14 select HAVE_FTRACE 15 select HAVE_FTRACE
15 select HAVE_IDE 16 select HAVE_IDE
16 select HAVE_LMB 17 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
23 select HAVE_OPROFILE 23 select HAVE_OPROFILE
24 select HAVE_KPROBES 24 select HAVE_KPROBES
25 select HAVE_KRETPROBES 25 select HAVE_KRETPROBES
26 select HAVE_DYNAMIC_FTRACE
26 select HAVE_FTRACE 27 select HAVE_FTRACE
27 select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) 28 select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
28 select HAVE_ARCH_KGDB if !X86_VOYAGER 29 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 @@
4config HAVE_FTRACE 4config HAVE_FTRACE
5 bool 5 bool
6 6
7config HAVE_DYNAMIC_FTRACE
8 bool
9
7config TRACER_MAX_TRACE 10config TRACER_MAX_TRACE
8 bool 11 bool
9 12
@@ -94,6 +97,7 @@ config CONTEXT_SWITCH_TRACER
94config DYNAMIC_FTRACE 97config DYNAMIC_FTRACE
95 bool "enable/disable ftrace tracepoints dynamically" 98 bool "enable/disable ftrace tracepoints dynamically"
96 depends on FTRACE 99 depends on FTRACE
100 depends on HAVE_DYNAMIC_FTRACE
97 default y 101 default y
98 help 102 help
99 This option will modify all the calls to ftrace dynamically 103 This option will modify all the calls to ftrace dynamically