Merge branch 'tip/tracing/ftrace' of...

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Merge branch 'tip/tracing/ftrace' of...
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
654952bc · Ingo Molnar · ed662d9b · c79a61f5 · 654952bc · 654952bc
Commit 654952bc authored Mar 02, 2009 by Ingo Molnar
14 changed files
--- a/arch/alpha/include/asm/ftrace.h
+++ b/arch/alpha/include/asm/ftrace.h
+/* empty */
--- a/arch/avr32/include/asm/ftrace.h
+++ b/arch/avr32/include/asm/ftrace.h
+/* empty */
--- a/arch/blackfin/include/asm/ftrace.h
+++ b/arch/blackfin/include/asm/ftrace.h
+/* empty */
--- a/arch/cris/include/asm/ftrace.h
+++ b/arch/cris/include/asm/ftrace.h
+/* empty */
--- a/arch/h8300/include/asm/ftrace.h
+++ b/arch/h8300/include/asm/ftrace.h
+/* empty */
--- a/arch/m68k/include/asm/ftrace.h
+++ b/arch/m68k/include/asm/ftrace.h
+/* empty */
--- a/arch/mips/include/asm/ftrace.h
+++ b/arch/mips/include/asm/ftrace.h
+/* empty */
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
+/* empty */
--- a/arch/um/include/asm/ftrace.h
+++ b/arch/um/include/asm/ftrace.h
+/* empty */
--- a/arch/xtensa/include/asm/ftrace.h
+++ b/arch/xtensa/include/asm/ftrace.h
+/* empty */
--- a/include/asm-frv/ftrace.h
+++ b/include/asm-frv/ftrace.h
+/* empty */
--- a/include/asm-m32r/ftrace.h
+++ b/include/asm-m32r/ftrace.h
+/* empty */
--- a/include/asm-mn10300/ftrace.h
+++ b/include/asm-mn10300/ftrace.h
+/* empty */
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -11,6 +11,8 @@
 #include <linux/bitops.h>
 #include <linux/sched.h>

+#include <asm/ftrace.h>
+
 #ifdef CONFIG_FUNCTION_TRACER

 extern int ftrace_enabled;
@@ -103,8 +105,6 @@ struct ftrace_func_command {
 };

 #ifdef CONFIG_DYNAMIC_FTRACE
-/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */
-#include <asm/ftrace.h>

 int ftrace_arch_code_modify_prepare(void);
 int ftrace_arch_code_modify_post_process(void);
@@ -282,8 +282,8 @@ static inline void __ftrace_enabled_restore(int enabled)
 #endif
 }

-#ifdef CONFIG_FRAME_POINTER
-/* TODO: need to fix this for ARM */
+#ifndef HAVE_ARCH_CALLER_ADDR
+# ifdef CONFIG_FRAME_POINTER
 #  define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
 #  define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1))
 #  define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2))
@@ -291,7 +291,7 @@ static inline void __ftrace_enabled_restore(int enabled)
 #  define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4))
 #  define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5))
 #  define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6))
-#else
+# else
 #  define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
 #  define CALLER_ADDR1 0UL
 #  define CALLER_ADDR2 0UL
@@ -299,7 +299,8 @@ static inline void __ftrace_enabled_restore(int enabled)
 #  define CALLER_ADDR4 0UL
 #  define CALLER_ADDR5 0UL
 #  define CALLER_ADDR6 0UL
-#endif
+# endif
+#endif /* ifndef HAVE_ARCH_CALLER_ADDR */

 #ifdef CONFIG_IRQSOFF_TRACER
  extern void time_hardirqs_on(unsigned long a0, unsigned long a1);