ftrace/x86: Get the current mcount addr for add_breakpoint()

[deliverable/linux.git] / arch / x86 / kernel / ftrace.c

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 3d837b00502bcc770c20195d09681fc692ee3411..4b3c195d4133bb26d5cc33ec92a3e1c6adc14b2f 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -380,9 +380,9 @@ static int add_breakpoints(struct dyn_ftrace *rec, int enable)
        unsigned long ftrace_addr;
        int ret;
 
-       ret = ftrace_test_record(rec, enable);
+       ftrace_addr = get_ftrace_old_addr(rec);
 
-       ftrace_addr = get_ftrace_addr(rec);
+       ret = ftrace_test_record(rec, enable);
 
        switch (ret) {
        case FTRACE_UPDATE_IGNORE:
@@ -394,8 +394,6 @@ static int add_breakpoints(struct dyn_ftrace *rec, int enable)
 
        case FTRACE_UPDATE_MODIFY_CALL_REGS:
        case FTRACE_UPDATE_MODIFY_CALL:
-               ftrace_addr = get_ftrace_old_addr(rec);
-               /* fall through */
        case FTRACE_UPDATE_MAKE_NOP:
                /* converting a call to a nop */
                return add_brk_on_call(rec, ftrace_addr);