From b729e3a4acaa64898a2a67a6aac55da07538bd81 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <nelhage@ksplice.com>
Date: Wed, 13 Apr 2011 11:44:13 -0400
Subject: [PATCH] --- yaml --- r: 248047 b: refs/heads/master c:
 0521e4c0bc73aa86152ee4e4bd03724c8a9e1d6b h: refs/heads/master i:   248045:
 20c6ad3431ecf1ca1604fba3ed452d39e34d821d   248043:
 cbcf5090f3f132b9a0817349042970e1b691c9fd   248039:
 6e27a35622b39e1dc593f369f07590432ddf11ea   248031:
 52a510580b6c307817c5f031af46ed1ea794f240 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kvm/emulate.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1fb39595805..a30de7089e61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49704f26586ca87fcab4fe9323fff8db41e78910
+refs/heads/master: 0521e4c0bc73aa86152ee4e4bd03724c8a9e1d6b
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index cb2efa463793..4c5ff22d101a 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -637,9 +637,12 @@ static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
 	int size, cur_size;
 
 	if (eip == fc->end) {
+		unsigned long linear = eip + ctxt->cs_base;
+		if (ctxt->mode != X86EMUL_MODE_PROT64)
+			linear &= (u32)-1;
 		cur_size = fc->end - fc->start;
 		size = min(15UL - cur_size, PAGE_SIZE - offset_in_page(eip));
-		rc = ops->fetch(ctxt->cs_base + eip, fc->data + cur_size,
+		rc = ops->fetch(linear, fc->data + cur_size,
 				size, ctxt->vcpu, &ctxt->exception);
 		if (rc != X86EMUL_CONTINUE)
 			return rc;