Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0001207 authored by Shaohua Li's avatar Shaohua Li Committed by Ingo Molnar
Browse files

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: default avatarShaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 25aac9dc

include/linux/ftrace.h

+4 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ extern int ftrace_update_ftrace_func(ftrace_func_t func); 
extern void ftrace_caller(void);

extern void ftrace_call(void);

extern void mcount_call(void);



#ifndef FTRACE_ADDR

#define FTRACE_ADDR ((unsigned long)ftrace_caller)

#endif

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

extern void ftrace_graph_caller(void);

extern int ftrace_enable_ftrace_graph_caller(void);

kernel/trace/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) 
	unsigned long ip, fl;

	unsigned long ftrace_addr;



	ftrace_addr = (unsigned long)ftrace_caller;

	ftrace_addr = (unsigned long)FTRACE_ADDR;



	ip = rec->ip;