From 14c62e1ea53a6502b08ae9505e6ecbc3767a6e35 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Tue, 13 Jul 2010 16:40:23 +0300
Subject: [PATCH] --- yaml --- r: 202415 b: refs/heads/master c:
 c0e0608cb902af1a1fd8d413ec0a07ee1e62c652 h: refs/heads/master i:   202413:
 bd2907f12b58885e232fffeb121019f3da9f9a93   202411:
 82ee1b6eee91aa40b1bd4ae667e5c8d87c7e091b   202407:
 fe95dc76a778c74f826bf2d96de7023783039ece   202399:
 b5fa828f57b98ba95f1b019e25e68f38a37c5fd9 v: v3

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

diff --git a/[refs] b/[refs]
index 2bb7b9637fe1..b81956083ee9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24157aaf833261e68e5a398fa54bd15e4fa1d0b7
+refs/heads/master: c0e0608cb902af1a1fd8d413ec0a07ee1e62c652
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 255473f974ab..b38bd8b92aa6 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -345,10 +345,10 @@ static u32 group_table[] = {
 	DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM,
 	0, 0, 0, 0,
 	[Group4*8] =
-	ByteOp | DstMem | SrcNone | ModRM, ByteOp | DstMem | SrcNone | ModRM,
+	ByteOp | DstMem | SrcNone | ModRM | Lock, ByteOp | DstMem | SrcNone | ModRM | Lock,
 	0, 0, 0, 0, 0, 0,
 	[Group5*8] =
-	DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM,
+	DstMem | SrcNone | ModRM | Lock, DstMem | SrcNone | ModRM | Lock,
 	SrcMem | ModRM | Stack, 0,
 	SrcMem | ModRM | Stack, SrcMemFAddr | ModRM | ImplicitOps,
 	SrcMem | ModRM | Stack, 0,