diff options
| author | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-23 03:59:09 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-23 03:59:09 +0100 |
| commit | 5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb (patch) | |
| tree | b9f61d0544ed06b7f07000a11797711cdd97d83f /arch/riscv/mm/extable.c | |
| parent | Merge branch 'next/misc' into for-next (diff) | |
| parent | riscv: provide a flat image loader (diff) | |
| download | linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.xz 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/mm/extable.c')
| -rw-r--r-- | arch/riscv/mm/extable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c index 7aed9178d365..2fc729422151 100644 --- a/arch/riscv/mm/extable.c +++ b/arch/riscv/mm/extable.c @@ -15,9 +15,9 @@ int fixup_exception(struct pt_regs *regs) { const struct exception_table_entry *fixup; - fixup = search_exception_tables(regs->sepc); + fixup = search_exception_tables(regs->epc); if (fixup) { - regs->sepc = fixup->fixup; + regs->epc = fixup->fixup; return 1; } return 0; |