[Xen-changelog] [xen stable-4.10] Revert "x86/guest: use the vcpu_info area from shared_info"

[patchbot@xxxxxxx]

commit af631930178b75e3747e7bfbf547f836be7e4202
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Mon Mar 5 15:02:24 2018 +0000
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Mar 5 15:09:10 2018 +0000

    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@xxxxxxxxxx>
---
 xen/arch/x86/guest/xen.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.10

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog