From d0e0211649da2402239805334fe0cb25cf0a9e8d Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 8 May 2013 13:02:38 +0000 Subject: [PATCH] --- yaml --- r: 375548 b: refs/heads/master c: d7266d7894b111dee9b081c05944533bc8780eca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/xen/enlighten.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 14782951eeab..4008f0aae5a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1aa3d8d9935dfb459d64f06ccd828b56147fd971 +refs/heads/master: d7266d7894b111dee9b081c05944533bc8780eca diff --git a/trunk/arch/arm/xen/enlighten.c b/trunk/arch/arm/xen/enlighten.c index 83d13b0d5f74..3dfa2b5c787d 100644 --- a/trunk/arch/arm/xen/enlighten.c +++ b/trunk/arch/arm/xen/enlighten.c @@ -165,13 +165,9 @@ static int __init xen_secondary_init(unsigned int cpu) info.offset = offset_in_page(vcpup); err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info); - if (err) { - pr_debug("register_vcpu_info failed: err=%d\n", err); - } else { - /* This cpu is using the registered vcpu info, even if - later ones fail to. */ - per_cpu(xen_vcpu, cpu) = vcpup; - } + BUG_ON(err); + per_cpu(xen_vcpu, cpu) = vcpup; + return 0; }