diff options
| author | Borislav Petkov <bp@suse.de> | 2020-12-01 18:22:55 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-01 18:22:55 +0100 |
| commit | 15936ca13dac032a3f4e6b4ba78add3880bddcf3 (patch) | |
| tree | b56c7a5c75b25e5d91a09c9f1875cae4e50198ba /arch/x86/kernel/cpu/mce | |
| parent | 4a24d80b8c3e9f89d6a6a7b89bd057c463b638d3 (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
Merge tag 'v5.10-rc6' into ras/core
Merge the -rc6 tag to pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/kernel/cpu/mce')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index ccac4c2fad46..f319bed1c59d 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1385,8 +1385,10 @@ noinstr void do_machine_check(struct pt_regs *regs) * When there's any problem use only local no_way_out state. */ if (!lmce) { - if (mce_end(order) < 0) - no_way_out = worst >= MCE_PANIC_SEVERITY; + if (mce_end(order) < 0) { + if (!no_way_out) + no_way_out = worst >= MCE_PANIC_SEVERITY; + } } else { /* * If there was a fatal machine check we should have |