# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID 8a1bb4c2f951c9fbbdd362363ee776a0e0f32c7b
# Parent  8802e603a0f17c38f1c1052f3d0449fbffa2f2bb
Bug fix for SMP-g: correctly set vcpu_info and map shared_info.
(vcpu_info is set by common code).


Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r 8802e603a0f1 -r 8a1bb4c2f951 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Thu May 11 19:16:04 2006
+++ b/xen/arch/ia64/xen/domain.c	Fri May 12 07:32:52 2006
@@ -179,7 +179,6 @@
 	    	memset(&d->shared_info->evtchn_mask[0], 0xff,
 		    sizeof(d->shared_info->evtchn_mask));
 
-	    v->vcpu_info = &(d->shared_info->vcpu_info[0]);
 	    v->arch.metaphysical_rr0 = d->arch.metaphysical_rr0;
 	    v->arch.metaphysical_rr4 = d->arch.metaphysical_rr4;
 	    v->arch.metaphysical_saved_rr0 = d->arch.metaphysical_rr0;
diff -r 8802e603a0f1 -r 8a1bb4c2f951 xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c	Thu May 11 19:16:04 2006
+++ b/xen/arch/ia64/xen/regionreg.c	Fri May 12 07:32:52 2006
@@ -258,7 +258,7 @@
 		if (!PSCB(v,metaphysical_mode))
 			set_rr(rr,newrrv.rrval);
 	} else if (rreg == 7) {
-		ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info,
+		ia64_new_rr7(vmMangleRID(newrrv.rrval),v->domain->shared_info,
 			     v->arch.privregs, v->domain->arch.shared_info_va,
 			     __get_cpu_var(vhpt_paddr));
 	} else {