From f7441c82b94b8f27664cb83e4e7400a560feaa20 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Tue, 21 Aug 2012 17:06:59 +0300
Subject: [PATCH] --- yaml --- r: 329877 b: refs/heads/master c:
 72fbefec26841699fee9ad0b050624aeb43d5bae h: refs/heads/master i:   329875:
 2e76b38368a6374f3daee5182a9e787682fbe4b2 v: v3

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

diff --git a/[refs] b/[refs]
index 83073d5bce8b..89f92839d731 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baa7e81e325bbb6ddebd7680ac1068859244b61d
+refs/heads/master: 72fbefec26841699fee9ad0b050624aeb43d5bae
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 4e49caf9224d..1d93079432b3 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -2693,11 +2693,11 @@ static __exit void hardware_unsetup(void)
 	free_kvm_area();
 }
 
-static void fix_pmode_dataseg(int seg, struct kvm_save_segment *save)
+static void fix_pmode_dataseg(int seg, struct kvm_segment *save)
 {
 	struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
 
-	if (vmcs_readl(sf->base) == save->base && (save->base & AR_S_MASK)) {
+	if (vmcs_readl(sf->base) == save->base && (save->ar_bytes & AR_S_MASK)) {
 		vmcs_write16(sf->selector, save->selector);
 		vmcs_writel(sf->base, save->base);
 		vmcs_write32(sf->limit, save->limit);