From: Keir Fraser <keir@xensource.com>
Date: Mon, 29 Oct 2007 15:05:27 +0000 (+0000)
Subject: x86: Remove dead code from arch_get_info_guest().
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14828^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8fbfe1c9c1c7a954bcb1d6c2142c75196ca2d9cd;p=xen.git

x86: Remove dead code from arch_get_info_guest().
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index fe90c09906..d79dc55059 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -800,24 +800,11 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c)
 
     if ( is_hvm_vcpu(v) )
     {
-        if ( !is_pv_32on64_domain(v->domain) )
-        {
-            memset(c.nat->ctrlreg, 0, sizeof(c.nat->ctrlreg));
-            c.nat->ctrlreg[0] = v->arch.hvm_vcpu.guest_cr[0];
-            c.nat->ctrlreg[2] = v->arch.hvm_vcpu.guest_cr[2];
-            c.nat->ctrlreg[3] = v->arch.hvm_vcpu.guest_cr[3];
-            c.nat->ctrlreg[4] = v->arch.hvm_vcpu.guest_cr[4];
-        }
-#ifdef CONFIG_COMPAT
-        else
-        {
-            memset(c.cmp->ctrlreg, 0, sizeof(c.cmp->ctrlreg));
-            c.cmp->ctrlreg[0] = v->arch.hvm_vcpu.guest_cr[0];
-            c.cmp->ctrlreg[2] = v->arch.hvm_vcpu.guest_cr[2];
-            c.cmp->ctrlreg[3] = v->arch.hvm_vcpu.guest_cr[3];
-            c.cmp->ctrlreg[4] = v->arch.hvm_vcpu.guest_cr[4];
-        }
-#endif
+        memset(c.nat->ctrlreg, 0, sizeof(c.nat->ctrlreg));
+        c.nat->ctrlreg[0] = v->arch.hvm_vcpu.guest_cr[0];
+        c.nat->ctrlreg[2] = v->arch.hvm_vcpu.guest_cr[2];
+        c.nat->ctrlreg[3] = v->arch.hvm_vcpu.guest_cr[3];
+        c.nat->ctrlreg[4] = v->arch.hvm_vcpu.guest_cr[4];
     }
     else
     {