From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 5 Mar 2018 15:02:24 +0000 (+0000)
Subject: Revert "x86/guest: use the vcpu_info area from shared_info"
X-Git-Tag: RELEASE-4.10.1~51^2~24
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=af631930178b75e3747e7bfbf547f836be7e4202;p=xen.git

Revert "x86/guest: use the vcpu_info area from shared_info"

This reverts commit 69f4d872e524932d392acd80989c5b776baa4522.

There is already the required commit in staging 4.10. Revert the
workaround from comet branch.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/arch/x86/guest/xen.c b/xen/arch/x86/guest/xen.c
index ed8b8c8c7b..2a5554ab26 100644
--- a/xen/arch/x86/guest/xen.c
+++ b/xen/arch/x86/guest/xen.c
@@ -257,8 +257,7 @@ void __init hypervisor_setup(void)
     map_shared_info();
 
     set_vcpu_id();
-    if ( nr_cpu_ids > XEN_LEGACY_MAX_VCPUS )
-        vcpu_info = xzalloc_array(struct vcpu_info, nr_cpu_ids);
+    vcpu_info = xzalloc_array(struct vcpu_info, nr_cpu_ids);
     if ( map_vcpuinfo() )
     {
         xfree(vcpu_info);