diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-08 09:02:38 -0400 |
---|---|---|
committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-13 12:14:22 -0400 |
commit | d7266d7894b111dee9b081c05944533bc8780eca (patch) | |
tree | e91ce2d7aea829acbf4f607d5af7df53f7b754d1 | |
parent | 1aa3d8d9935dfb459d64f06ccd828b56147fd971 (diff) |
xen/arm: do not handle VCPUOP_register_vcpu_info failures
We expect VCPUOP_register_vcpu_info to succeed, do not try to handle
failures.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r-- | arch/arm/xen/enlighten.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 83d13b0d5f74..3dfa2b5c787d 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c | |||
@@ -165,13 +165,9 @@ static int __init xen_secondary_init(unsigned int cpu) | |||
165 | info.offset = offset_in_page(vcpup); | 165 | info.offset = offset_in_page(vcpup); |
166 | 166 | ||
167 | err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info); | 167 | err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info); |
168 | if (err) { | 168 | BUG_ON(err); |
169 | pr_debug("register_vcpu_info failed: err=%d\n", err); | 169 | per_cpu(xen_vcpu, cpu) = vcpup; |
170 | } else { | 170 | |
171 | /* This cpu is using the registered vcpu info, even if | ||
172 | later ones fail to. */ | ||
173 | per_cpu(xen_vcpu, cpu) = vcpup; | ||
174 | } | ||
175 | return 0; | 171 | return 0; |
176 | } | 172 | } |
177 | 173 | ||