import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / mips / kernel / ftrace.c

diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c
index dba90ec0dc385ffcad5cc09eda51031d4e9a0fcc..e2abb6160daf244fb61911ed0178740ae3af2517 100644 (file)
--- a/arch/mips/kernel/ftrace.c
+++ b/arch/mips/kernel/ftrace.c
@@ -195,7 +195,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
        return ftrace_modify_code(FTRACE_CALL_IP, new);
 }
 
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
 {
        /* Encode the instructions when booting */
        ftrace_dyn_arch_init_insns();
@@ -203,9 +203,6 @@ int __init ftrace_dyn_arch_init(void *data)
        /* Remove "b ftrace_stub" to ensure ftrace_caller() is executed */
        ftrace_modify_code(MCOUNT_ADDR, INSN_NOP);
 
-       /* The return code is retured via data */
-       *(unsigned long *)data = 0;
-
        return 0;
 }
 #endif /* CONFIG_DYNAMIC_FTRACE */