aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKASHI Takahiro <takahiro.akashi@linaro.org>2014-05-30 11:23:41 +0900
committerMark Brown <broonie@linaro.org>2014-05-30 18:15:44 +0100
commit0cc5286fc3ca12ec0d388e4d8c08a66b40d52233 (patch)
treea9d20546345f5df6bcb413bb270b637c59c00b21
parentd10fbc12d0c4c6e872de2a342b88b896e430cea3 (diff)
downloadlinux-linaro-stable-0cc5286fc3ca12ec0d388e4d8c08a66b40d52233.tar.gz
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>
-rw-r--r--arch/arm64/kernel/ftrace.c1
1 files changed, 1 insertions, 0 deletions
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 */