Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / powerpc / kernel / ftrace.c

diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index b0ded97ee4e11148cd436809aaab2c36c106893a..6a014c763cc71da4a9a5fd523649f105bf5fdc10 100644 (file)
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -532,13 +532,8 @@ void arch_ftrace_update_code(int command)
                ftrace_disable_ftrace_graph_caller();
 }
 
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
 {
-       /* caller expects data to be zero */
-       unsigned long *p = data;
-
-       *p = 0;
-
        return 0;
 }
 #endif /* CONFIG_DYNAMIC_FTRACE */