diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-05-08 13:01:21 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-05-14 17:37:29 +0200 |
| commit | 7c0868e03b7a7c50fa10957d8dddaebb09c72044 (patch) | |
| tree | 3b5fc12dd767f6ebbbec8058f59bea5ff585ab0d /kernel/trace | |
| parent | ftrace: Make get_ftrace_addr() and get_ftrace_addr_old() global (diff) | |
| download | linux-7c0868e03b7a7c50fa10957d8dddaebb09c72044.tar.xz linux-7c0868e03b7a7c50fa10957d8dddaebb09c72044.zip | |
ftrace: Use the ftrace_addr helper functions to find the ftrace_addr
With the moving of the functions that determine what the mcount call site
should be replaced with into the generic code, there is a few places
in the generic code that can use them instead of hard coding it as it
does.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ftrace.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index e825fded435d..52c2b53b7953 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1798,12 +1798,12 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) unsigned long ftrace_addr; int ret; - ret = ftrace_update_record(rec, enable); + ftrace_addr = ftrace_get_addr_new(rec); - if (rec->flags & FTRACE_FL_REGS) - ftrace_addr = (unsigned long)FTRACE_REGS_ADDR; - else - ftrace_addr = (unsigned long)FTRACE_ADDR; + /* This needs to be done before we call ftrace_update_record */ + ftrace_old_addr = ftrace_get_addr_curr(rec); + + ret = ftrace_update_record(rec, enable); switch (ret) { case FTRACE_UPDATE_IGNORE: @@ -1817,11 +1817,6 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) case FTRACE_UPDATE_MODIFY_CALL_REGS: case FTRACE_UPDATE_MODIFY_CALL: - if (rec->flags & FTRACE_FL_REGS) - ftrace_old_addr = (unsigned long)FTRACE_ADDR; - else - ftrace_old_addr = (unsigned long)FTRACE_REGS_ADDR; - return ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr); } |