---

yaml --- r: 375548 b: refs/heads/master c: d7266d7 h: refs/heads/master v: v3
git-mirror · May 13, 2013 · d0e0211 · d0e0211
1 parent deee0c6
commit d0e0211
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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;
 }