aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2009-02-11 20:06:43 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-02-22 18:48:55 -0500
commit60ce8f7260d9ae4ff17548f5a275edfbc200187a (patch)
tree6cc3a37f27ba582434b464a94fe0e1c37b8f8e08 /arch/powerpc
parentfad4f47cc8b2b8f7e7d062c40c66188cdf783137 (diff)
powerpc32, ftrace: dynamic function graph tracer
This patch gets function graph tracing working with dynamic function tracer on PowerPC32. Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/Kconfig2
-rw-r--r--arch/powerpc/kernel/entry_32.S8
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index f50b1c41a699..e46995a21685 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -111,7 +111,7 @@ config PPC
111 select HAVE_FTRACE_MCOUNT_RECORD 111 select HAVE_FTRACE_MCOUNT_RECORD
112 select HAVE_DYNAMIC_FTRACE 112 select HAVE_DYNAMIC_FTRACE
113 select HAVE_FUNCTION_TRACER 113 select HAVE_FUNCTION_TRACER
114 select HAVE_FUNCTION_GRAPH_TRACER if PPC64 || !DYNAMIC_FTRACE 114 select HAVE_FUNCTION_GRAPH_TRACER
115 select ARCH_WANT_OPTIONAL_GPIOLIB 115 select ARCH_WANT_OPTIONAL_GPIOLIB
116 select HAVE_IDE 116 select HAVE_IDE
117 select HAVE_IOREMAP_PROT 117 select HAVE_IOREMAP_PROT
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 12247b937d25..0506f54b4237 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1183,7 +1183,12 @@ _GLOBAL(ftrace_caller)
1183ftrace_call: 1183ftrace_call:
1184 bl ftrace_stub 1184 bl ftrace_stub
1185 nop 1185 nop
1186 1186#ifdef CONFIG_FUNCTION_GRAPH_TRACER
1187.globl ftrace_graph_call
1188ftrace_graph_call:
1189 b ftrace_graph_stub
1190_GLOBAL(ftrace_graph_stub)
1191#endif
1187 MCOUNT_RESTORE_FRAME 1192 MCOUNT_RESTORE_FRAME
1188 /* old link register ends up in ctr reg */ 1193 /* old link register ends up in ctr reg */
1189 bctr 1194 bctr
@@ -1205,7 +1210,6 @@ _GLOBAL(_mcount)
1205 b ftrace_graph_caller 1210 b ftrace_graph_caller
1206#endif 1211#endif
1207 MCOUNT_RESTORE_FRAME 1212 MCOUNT_RESTORE_FRAME
1208
1209 bctr 1213 bctr
1210#endif 1214#endif
1211 1215