aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/alpha/include/asm/ftrace.h1
-rw-r--r--arch/avr32/include/asm/ftrace.h1
-rw-r--r--arch/blackfin/include/asm/ftrace.h1
-rw-r--r--arch/cris/include/asm/ftrace.h1
-rw-r--r--arch/h8300/include/asm/ftrace.h1
-rw-r--r--arch/m68k/include/asm/ftrace.h1
-rw-r--r--arch/mips/include/asm/ftrace.h1
-rw-r--r--arch/parisc/include/asm/ftrace.h1
-rw-r--r--arch/um/include/asm/ftrace.h1
-rw-r--r--arch/xtensa/include/asm/ftrace.h1
-rw-r--r--include/asm-frv/ftrace.h1
-rw-r--r--include/asm-m32r/ftrace.h1
-rw-r--r--include/asm-mn10300/ftrace.h1
-rw-r--r--include/linux/ftrace.h41
14 files changed, 34 insertions, 20 deletions
diff --git a/arch/alpha/include/asm/ftrace.h b/arch/alpha/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/alpha/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/avr32/include/asm/ftrace.h b/arch/avr32/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/avr32/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/blackfin/include/asm/ftrace.h b/arch/blackfin/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/blackfin/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/cris/include/asm/ftrace.h b/arch/cris/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/cris/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/h8300/include/asm/ftrace.h b/arch/h8300/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/h8300/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/m68k/include/asm/ftrace.h b/arch/m68k/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/m68k/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/mips/include/asm/ftrace.h b/arch/mips/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/mips/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/parisc/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/um/include/asm/ftrace.h b/arch/um/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/um/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/xtensa/include/asm/ftrace.h b/arch/xtensa/include/asm/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/arch/xtensa/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/include/asm-frv/ftrace.h b/include/asm-frv/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/include/asm-frv/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/include/asm-m32r/ftrace.h b/include/asm-m32r/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/include/asm-m32r/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/include/asm-mn10300/ftrace.h b/include/asm-mn10300/ftrace.h
new file mode 100644
index 00000000000..40a8c178f10
--- /dev/null
+++ b/include/asm-mn10300/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 847bb3c48dd..1f69ac7c158 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -11,6 +11,8 @@
11#include <linux/bitops.h> 11#include <linux/bitops.h>
12#include <linux/sched.h> 12#include <linux/sched.h>
13 13
14#include <asm/ftrace.h>
15
14#ifdef CONFIG_FUNCTION_TRACER 16#ifdef CONFIG_FUNCTION_TRACER
15 17
16extern int ftrace_enabled; 18extern int ftrace_enabled;
@@ -103,8 +105,6 @@ struct ftrace_func_command {
103}; 105};
104 106
105#ifdef CONFIG_DYNAMIC_FTRACE 107#ifdef CONFIG_DYNAMIC_FTRACE
106/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */
107#include <asm/ftrace.h>
108 108
109int ftrace_arch_code_modify_prepare(void); 109int ftrace_arch_code_modify_prepare(void);
110int ftrace_arch_code_modify_post_process(void); 110int ftrace_arch_code_modify_post_process(void);
@@ -282,24 +282,25 @@ static inline void __ftrace_enabled_restore(int enabled)
282#endif 282#endif
283} 283}
284 284
285#ifdef CONFIG_FRAME_POINTER 285#ifndef HAVE_ARCH_CALLER_ADDR
286/* TODO: need to fix this for ARM */ 286# ifdef CONFIG_FRAME_POINTER
287# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) 287# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
288# define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1)) 288# define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1))
289# define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2)) 289# define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2))
290# define CALLER_ADDR3 ((unsigned long)__builtin_return_address(3)) 290# define CALLER_ADDR3 ((unsigned long)__builtin_return_address(3))
291# define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4)) 291# define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4))
292# define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5)) 292# define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5))
293# define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6)) 293# define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6))
294#else 294# else
295# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) 295# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
296# define CALLER_ADDR1 0UL 296# define CALLER_ADDR1 0UL
297# define CALLER_ADDR2 0UL 297# define CALLER_ADDR2 0UL
298# define CALLER_ADDR3 0UL 298# define CALLER_ADDR3 0UL
299# define CALLER_ADDR4 0UL 299# define CALLER_ADDR4 0UL
300# define CALLER_ADDR5 0UL 300# define CALLER_ADDR5 0UL
301# define CALLER_ADDR6 0UL 301# define CALLER_ADDR6 0UL
302#endif 302# endif
303#endif /* ifndef HAVE_ARCH_CALLER_ADDR */
303 304
304#ifdef CONFIG_IRQSOFF_TRACER 305#ifdef CONFIG_IRQSOFF_TRACER
305 extern void time_hardirqs_on(unsigned long a0, unsigned long a1); 306 extern void time_hardirqs_on(unsigned long a0, unsigned long a1);