From cc3daaf1856c5c07e293c3494b80a10c54f5f357 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 1 Aug 2010 13:53:19 +0300
Subject: [PATCH] --- yaml --- r: 215665 b: refs/heads/master c:
 d4709c78eeff2b272e0b9727748b72371b0e71ab h: refs/heads/master i:   215663:
 f653f36bceeec598c83783031b343ecee0dfa75a v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/include/asm/kvm_emulate.h | 1 -
 trunk/arch/x86/kvm/emulate.c             | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4440102f339f..04a5c87d27a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91ff3cb43cb3dd8810d726dfa1f3736dc9aea1df
+refs/heads/master: d4709c78eeff2b272e0b9727748b72371b0e71ab
diff --git a/trunk/arch/x86/include/asm/kvm_emulate.h b/trunk/arch/x86/include/asm/kvm_emulate.h
index 0c835f7eb308..e425444658e8 100644
--- a/trunk/arch/x86/include/asm/kvm_emulate.h
+++ b/trunk/arch/x86/include/asm/kvm_emulate.h
@@ -202,7 +202,6 @@ struct decode_cache {
 	u8 modrm_reg;
 	u8 modrm_rm;
 	u8 modrm_seg;
-	u8 use_modrm_ea;
 	bool rip_relative;
 	unsigned long modrm_ea;
 	void *modrm_ptr;
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 898a55ba3e14..7d2c715f1a2a 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -597,7 +597,6 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
 	c->modrm_reg |= (c->modrm & 0x38) >> 3;
 	c->modrm_rm |= (c->modrm & 0x07);
 	c->modrm_ea = 0;
-	c->use_modrm_ea = 1;
 	c->modrm_seg = VCPU_SREG_DS;
 
 	if (c->modrm_mod == 3) {