diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2018-11-15 22:42:03 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-11-30 13:29:05 +0000 |
| commit | 7dc48bf96aa0fc8aa5b38cc3e5c36ac03171e680 (patch) | |
| tree | 24698b7b4d8c5e972e6b7bc898634e2d20032df2 /arch/arm64/kernel/ftrace.c | |
| parent | 49e258e05e8e56d53af20be481b311c43d7c286b (diff) | |
| download | linux-stable-7dc48bf96aa0fc8aa5b38cc3e5c36ac03171e680.tar.gz linux-stable-7dc48bf96aa0fc8aa5b38cc3e5c36ac03171e680.tar.bz2 linux-stable-7dc48bf96aa0fc8aa5b38cc3e5c36ac03171e680.zip | |
arm64: ftrace: always pass instrumented pc in x0
The core ftrace hooks take the instrumented PC in x0, but for some
reason arm64's prepare_ftrace_return() takes this in x1.
For consistency, let's flip the argument order and always pass the
instrumented PC in x0.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Torsten Duwe <duwe@suse.de>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/ftrace.c')
| -rw-r--r-- | arch/arm64/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 2135665a8ab3..b4bd46bdc4d2 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -211,7 +211,7 @@ int __init ftrace_dyn_arch_init(void) * * Note that @frame_pointer is used only for sanity check later. */ -void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, +void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent, unsigned long frame_pointer) { unsigned long return_hooker = (unsigned long)&return_to_handler; |