Signed-off-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com> --- arch/arm/xen/enlighten.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 6c09cc4..59f5421 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -93,6 +93,12 @@ static void xen_percpu_init(void) int err; int cpu = get_cpu(); + /* vcpu_info already registered, can happen with cpu-hotplug */ + if (per_cpu(xen_vcpu, cpu) != NULL) { + put_cpu(); + return; + } + pr_info("Xen: initializing cpu%d\n", cpu); vcpup = per_cpu_ptr(xen_vcpu_info, cpu); -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel