diff options
| author | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-22 18:59:09 -0800 |
|---|---|---|
| committer | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-22 18:59:09 -0800 |
| commit | 5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb (patch) | |
| tree | b9f61d0544ed06b7f07000a11797711cdd97d83f /arch/riscv/kernel/perf_callchain.c | |
| parent | 4a979862dde46b738316014ca4995eae2f428413 (diff) | |
| parent | 405fe7aa0dbaa6cb8cfe62771eee67076d30aca1 (diff) | |
| download | talos-op-linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.gz talos-op-linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.zip | |
Merge branch 'next/nommu' into for-next
Conflicts:
arch/riscv/boot/Makefile
arch/riscv/include/asm/sbi.h
Diffstat (limited to 'arch/riscv/kernel/perf_callchain.c')
| -rw-r--r-- | arch/riscv/kernel/perf_callchain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/kernel/perf_callchain.c b/arch/riscv/kernel/perf_callchain.c index 8d2804f05cf9..cf190197a22f 100644 --- a/arch/riscv/kernel/perf_callchain.c +++ b/arch/riscv/kernel/perf_callchain.c @@ -67,7 +67,7 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry, return; fp = regs->s0; - perf_callchain_store(entry, regs->sepc); + perf_callchain_store(entry, regs->epc); fp = user_backtrace(entry, fp, regs->ra); while (fp && !(fp & 0x3) && entry->nr < entry->max_stack) |
