diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2018-11-16 01:42:03 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-11-30 16:29:05 +0300 |
| commit | 7dc48bf96aa0fc8aa5b38cc3e5c36ac03171e680 (patch) | |
| tree | 24698b7b4d8c5e972e6b7bc898634e2d20032df2 /arch/arm64/kernel/entry-ftrace.S | |
| parent | 49e258e05e8e56d53af20be481b311c43d7c286b (diff) | |
| download | linux-7dc48bf96aa0fc8aa5b38cc3e5c36ac03171e680.tar.xz | |
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/entry-ftrace.S')
| -rw-r--r-- | arch/arm64/kernel/entry-ftrace.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index 0cd8f828d9c3..032e24d2d554 100644 --- a/arch/arm64/kernel/entry-ftrace.S +++ b/arch/arm64/kernel/entry-ftrace.S @@ -176,10 +176,10 @@ ENDPROC(ftrace_stub) * and run return_to_handler() later on its exit. */ ENTRY(ftrace_graph_caller) - mcount_get_lr_addr x0 // pointer to function's saved lr - mcount_get_pc x1 // function's pc + mcount_get_pc x0 // function's pc + mcount_get_lr_addr x1 // pointer to function's saved lr mcount_get_parent_fp x2 // parent's fp - bl prepare_ftrace_return // prepare_ftrace_return(&lr, pc, fp) + bl prepare_ftrace_return // prepare_ftrace_return(pc, &lr, fp) mcount_exit ENDPROC(ftrace_graph_caller) |