diff options
| author |   Christophe Leroy <christophe.leroy@csgroup.eu> | 2021-08-23 08:24:21 +0000 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2021-08-26 21:21:07 +1000 |
| commit | 806c0e6e7e97adc17389c8dc1f52d4736f49299b (patch) | |
| tree | 87b731a92cd76db6d972cd5a3908043c88419dca /arch/powerpc/mm/book3s64/slb.c | |
| parent | powerpc: Remove MSR_PR check in interrupt_exit_{user/kernel}_prepare() (diff) | |
| download | linux-dev-806c0e6e7e97adc17389c8dc1f52d4736f49299b.tar.xz linux-dev-806c0e6e7e97adc17389c8dc1f52d4736f49299b.zip | |
powerpc: Refactor verification of MSR_RI
40x and BOOKE don't have MSR_RI therefore all tests involving
MSR_RI may be problematic on those plateforms.
Create helpers to check or set MSR_RI in regs, and use them
in common code.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c2fb93708196734f4176dda334aaa3055f213b89.1629707037.git.christophe.leroy@csgroup.eu
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/mm/book3s64/slb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/book3s64/slb.c b/arch/powerpc/mm/book3s64/slb.c index c91bd85eb90e..f0037bcc47a0 100644 --- a/arch/powerpc/mm/book3s64/slb.c +++ b/arch/powerpc/mm/book3s64/slb.c @@ -822,7 +822,7 @@ DEFINE_INTERRUPT_HANDLER_RAW(do_slb_fault) /* IRQs are not reconciled here, so can't check irqs_disabled */ VM_WARN_ON(mfmsr() & MSR_EE); - if (unlikely(!(regs->msr & MSR_RI))) + if (regs_is_unrecoverable(regs)) return -EINVAL; /* |