From 1b619804dffde5452bcab226fe9d65bdf2487544 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Fri, 19 Nov 2010 13:16:22 +0100
Subject: [PATCH] --- yaml --- r: 308089 b: refs/heads/master c:
 a129a7c84582629741e5fa6f40026efcd7a65bd4 h: refs/heads/master i:   308087:
 ab9934227a1202506b093ce18e86b76396142eab v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3e55b9a5b01..aaafb5a7ae7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8571723a698dcc0ee16c1c63908aa99dd940ce5c
+refs/heads/master: a129a7c84582629741e5fa6f40026efcd7a65bd4
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index 66e1c51be084..5f793e6c854b 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/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)