Home| summaryrefslogtreecommitdiff |
diff options
| author | Michal Suchanek <msuchanek@suse.de> | 2018-07-10 19:00:38 +0200 |
|---|---|---|
| committer | Michal Suchanek <msuchanek@suse.de> | 2018-07-10 19:00:48 +0200 |
| commit | cb7e5abb07a82642b800253c8e39b1c03a284a36 (patch) | |
| tree | fe06329a2d7936fa1b392ab5f4fe8beaf18c0756 | |
| parent | 608d234e744f7ca1de557357c3653a957512953c (diff) | |
powerpc: Machine check interrupt is a non-maskable interrupt
(bsc#1094244).
suse-commit: b19831629c3fc34713167401661768c4625a13e0
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index b4550ed71efd..f4b017e44014 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -751,8 +751,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)) @@ -784,10 +786,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) |