diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:37:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:37:39 +0200 |
| commit | e6aa640eb2f68920cb849aec0cab44f05d843238 (patch) | |
| tree | 42e07ee412112abe90d459f821e8d73c26cc648e /arch/arm64/kernel/perf_callchain.c | |
| parent | 1f573cce48a2ebb35953034062ef01056b7d6a58 (diff) | |
| parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
| download | linux-next-e6aa640eb2f68920cb849aec0cab44f05d843238.tar.gz linux-next-e6aa640eb2f68920cb849aec0cab44f05d843238.zip | |
Merge 5.3-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/kernel/perf_callchain.c')
| -rw-r--r-- | arch/arm64/kernel/perf_callchain.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c index 9d63514b9836..b0e03e052dd1 100644 --- a/arch/arm64/kernel/perf_callchain.c +++ b/arch/arm64/kernel/perf_callchain.c @@ -154,12 +154,7 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, return; } - frame.fp = regs->regs[29]; - frame.pc = regs->pc; -#ifdef CONFIG_FUNCTION_GRAPH_TRACER - frame.graph = 0; -#endif - + start_backtrace(&frame, regs->regs[29], regs->pc); walk_stackframe(current, &frame, callchain_trace, entry); } |