aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2009-01-08 22:29:42 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-14 06:11:18 -0500
commitf00012074b1a1a67d9c8603617bbbab267347ca6 (patch)
tree7a5ec4d30a513914277ccaa607ff88ecf294f84a /kernel
parent25aac9dc7c8c73798c1be8aa36141f980d32579e (diff)
ftrace, ia64: Add macro for ftrace_caller
Define FTRACE_ADDR. In IA64, a function pointer isn't a 'unsigned long' but a 'struct {unsigned long ip, unsigned long gp}'. Signed-off-by: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 76bb884b6e16..9f536108d3f3 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -455,7 +455,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
455 unsigned long ip, fl; 455 unsigned long ip, fl;
456 unsigned long ftrace_addr; 456 unsigned long ftrace_addr;
457 457
458 ftrace_addr = (unsigned long)ftrace_caller; 458 ftrace_addr = (unsigned long)FTRACE_ADDR;
459 459
460 ip = rec->ip; 460 ip = rec->ip;
461 461