1 files changed, 3 insertions, 4 deletions

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 3d2cef6488ea..f193414d0f6f 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -170,9 +170,6 @@ static int xen_starting_cpu(unsigned int cpu)
         pr_info("Xen: initializing cpu%d\n", cpu);
         vcpup = per_cpu_ptr(xen_vcpu_info, cpu);
 
-        /* Direct vCPU id mapping for ARM guests. */
-        per_cpu(xen_vcpu_id, cpu) = cpu;
-
         info.mfn = virt_to_gfn(vcpup);
         info.offset = xen_offset_in_page(vcpup);
 
@@ -330,6 +327,7 @@ static int __init xen_guest_init(void)
 {
         struct xen_add_to_physmap xatp;
         struct shared_info *shared_info_page = NULL;
+        int cpu;
 
         if (!xen_domain())
                 return 0;
@@ -380,7 +378,8 @@ static int __init xen_guest_init(void)
                 return -ENOMEM;
 
         /* Direct vCPU id mapping for ARM guests. */
-        per_cpu(xen_vcpu_id, 0) = 0;
+        for_each_possible_cpu(cpu)
+                per_cpu(xen_vcpu_id, cpu) = cpu;
 
         xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames();
         if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn,