diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2014-05-30 11:23:41 +0900 |
|---|---|---|
| committer | Show Liu <show.liu@linaro.org> | 2014-06-18 12:04:18 +0800 |
| commit | a305d1241cbbf808be64b3b837134f1fc118f84e (patch) | |
| tree | 7898780da07179efea41f1a9f1df463a2886d8c6 /arch | |
| parent | 54d3f8c7699ce60dfc23d41499a7224c65210a9d (diff) | |
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>
(cherry picked from LSK commit 0cc5286fc3ca12ec0d388e4d8c08a66b40d52233)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/ftrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 2e61b956e7f..649890a3ac4 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 */ |