1 files changed, 8 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 66e1c51be084..5f793e6c854b 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -437,6 +437,14 @@ static inline void mce_gather_info(struct mce *m, struct pt_regs *regs)
                 if (m->mcgstatus & (MCG_STATUS_RIPV|MCG_STATUS_EIPV)) {
                         m->ip = regs->ip;
                         m->cs = regs->cs;
+
+                        /*
+                         * When in VM86 mode make the cs look like ring 3
+                         * always. This is a lie, but it's better than passing
+                         * the additional vm86 bit around everywhere.
+                         */
+                        if (v8086_mode(regs))
+                                m->cs |= 3;
                 }
                 /* Use accurate RIP reporting if available. */
                 if (rip_msr)