diff options
| author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-13 19:10:19 +0200 |
|---|---|---|
| committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-13 19:10:19 +0200 |
| commit | 14655070177685c8b390e1caec15da757228be1a (patch) | |
| tree | cbfb604b5a91e1e57f79bf2f7a83dce84a24094e /arch/powerpc/kernel/traps.c | |
| parent | 948c95381a819380e1f4f99ed699a0bc5dc7370f (diff) | |
| parent | b300b28b78145b832f1112d77035111e35112cec (diff) | |
Merge tag 'v5.4.74' into toradex_5.4.y
This is the 5.4.74 stable release
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 014ff0701f24..9432fc6af28a 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -510,11 +510,11 @@ out: #ifdef CONFIG_PPC_BOOK3S_64 BUG_ON(get_paca()->in_nmi == 0); if (get_paca()->in_nmi > 1) - nmi_panic(regs, "Unrecoverable nested System Reset"); + die("Unrecoverable nested System Reset", regs, SIGABRT); #endif /* Must die if the interrupt is not recoverable */ if (!(regs->msr & MSR_RI)) - nmi_panic(regs, "Unrecoverable System Reset"); + die("Unrecoverable System Reset", regs, SIGABRT); if (saved_hsrrs) { mtspr(SPRN_HSRR0, hsrr0); @@ -858,7 +858,7 @@ void machine_check_exception(struct pt_regs *regs) /* Must die if the interrupt is not recoverable */ if (!(regs->msr & MSR_RI)) - nmi_panic(regs, "Unrecoverable Machine check"); + die("Unrecoverable Machine check", regs, SIGBUS); return; |