diff options
| author | Linus Torvalds | 2019-02-10 18:57:42 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2019-02-10 18:57:42 +0100 |
| commit | aadaa8061189a9e5d8a1327b328453d663e8cbc9 (patch) | |
| tree | 8ca6a12e3512e5f784432991f38c43200e569b76 /arch/x86/kernel | |
| parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | x86/mm: Make set_pmd_at() paravirt aware (diff) | |
| download | kernel-qcow2-linux-aadaa8061189a9e5d8a1327b328453d663e8cbc9.tar.gz kernel-qcow2-linux-aadaa8061189a9e5d8a1327b328453d663e8cbc9.tar.xz kernel-qcow2-linux-aadaa8061189a9e5d8a1327b328453d663e8cbc9.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A handful of fixes:
- Fix an MCE corner case bug/crash found via MCE injection testing
- Fix 5-level paging boot crash
- Fix MCE recovery cache invalidation bug
- Fix regression on Xen guests caused by a recent PMD level mremap
speedup optimization"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Make set_pmd_at() paravirt aware
x86/mm/cpa: Fix set_mce_nospec()
x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 672c7225cb1b..6ce290c506d9 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -784,6 +784,7 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp, quirk_no_way_out(i, m, regs); if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) { + m->bank = i; mce_read_aux(m, i); *msg = tmp; return 1; |