From: AKASHI Takahiro <takahiro.akashi@linaro.org>
Date: Fri, 30 May 2014 02:23:41 +0000 (+0900)
Subject: arm64: ftrace: (bugfix) synced with ftcace interface change
X-Git-Tag: firefly_0821_release~3680^2~36^2~52^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0cc5286fc3ca12ec0d388e4d8c08a66b40d52233;p=firefly-linux-kernel-4.4.55.git

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 2e61b956e7f6..649890a3ac4e 100644
--- 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 */