arm64: ftrace: (bugfix) synced with ftcace interface change

ftrace_init() failed since ftrace_dyn_arch_init() doesn't initialize
the argument to null.
This bug comes in only if arm64 ftrace is back-ported as
ftrace_dyn_arch_init() interface has been changed in the merge window of
3.15.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c
index 2e61b956e7f66517ae50c78a9e71ca7368d60364..649890a3ac4e747cd49884f8e0d07a3bc7959bb8 100644 (file)
--- a/arch/arm64/kernel/ftrace.c
+++ b/arch/arm64/kernel/ftrace.c
@@ -94,6 +94,7 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,
 
 int __init ftrace_dyn_arch_init(void *data)
 {
+       *(unsigned long *)data = 0;
        return 0;
 }
 #endif /* CONFIG_DYNAMIC_FTRACE */