aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/ftrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r--arch/x86/kernel/ftrace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index b399eed23538..b1e5e2244eca 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -33,17 +33,17 @@ union ftrace_code_union {
33}; 33};
34 34
35 35
36static int notrace ftrace_calc_offset(long ip, long addr) 36static int ftrace_calc_offset(long ip, long addr)
37{ 37{
38 return (int)(addr - ip); 38 return (int)(addr - ip);
39} 39}
40 40
41notrace unsigned char *ftrace_nop_replace(void) 41unsigned char *ftrace_nop_replace(void)
42{ 42{
43 return (char *)ftrace_nop; 43 return (char *)ftrace_nop;
44} 44}
45 45
46notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) 46unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
47{ 47{
48 static union ftrace_code_union calc; 48 static union ftrace_code_union calc;
49 49
@@ -57,7 +57,7 @@ notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
57 return calc.code; 57 return calc.code;
58} 58}
59 59
60notrace int 60int
61ftrace_modify_code(unsigned long ip, unsigned char *old_code, 61ftrace_modify_code(unsigned long ip, unsigned char *old_code,
62 unsigned char *new_code) 62 unsigned char *new_code)
63{ 63{
@@ -90,7 +90,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
90 return 0; 90 return 0;
91} 91}
92 92
93notrace int ftrace_update_ftrace_func(ftrace_func_t func) 93int ftrace_update_ftrace_func(ftrace_func_t func)
94{ 94{
95 unsigned long ip = (unsigned long)(&ftrace_call); 95 unsigned long ip = (unsigned long)(&ftrace_call);
96 unsigned char old[MCOUNT_INSN_SIZE], *new; 96 unsigned char old[MCOUNT_INSN_SIZE], *new;