Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-07-10 19:05:44 +0200
committerMichal Suchanek <msuchanek@suse.de>2018-07-10 19:05:48 +0200
commite5800e35716f5b571662cc08d6089de4b26e96bc (patch)
tree496e375f6353d2d64d03d7cb9b4ded8aa70f9f50
parentf70924b0845d29df3c4b6d8586b09583e1720ee5 (diff)
powerpc: Machine check interrupt is a non-maskable interrupt
(bsc#1094244). suse-commit: 14329282dcddbf7c4473b86a82cfc12ba7b57643
-rw-r--r--arch/powerpc/kernel/traps.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index a2846ffc1339..c0c36833533a 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -713,8 +713,10 @@ int machine_check_generic(struct pt_regs *regs)
void machine_check_exception(struct pt_regs *regs)
{
- enum ctx_state prev_state = exception_enter();
int recover = 0;
+ bool nested = in_nmi();
+ if (!nested)
+ nmi_enter();
/* 64s accounts the mce in machine_check_early when in HVMODE */
if (!IS_ENABLED(CONFIG_PPC_BOOK3S_64) || !cpu_has_feature(CPU_FTR_HVMODE))
@@ -757,10 +759,11 @@ void machine_check_exception(struct pt_regs *regs)
/* Must die if the interrupt is not recoverable */
if (!(regs->msr & MSR_RI))
- panic("Unrecoverable Machine check");
+ nmi_panic(regs, "Unrecoverable Machine check");
bail:
- exception_exit(prev_state);
+ if (!nested)
+ nmi_exit();
}
void SMIException(struct pt_regs *regs)