ia64/xen-unstable

changeset 10006:a7b7528c5ec1

[IA64] bug fix (for SMP-g)

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@bull.net>
author awilliam@xenbuild.aw
date Fri May 12 10:21:57 2006 -0600 (2006-05-12)
parents 304b3d9011c3
children b487f4e1b09f
files xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/regionreg.c
line diff
     1.1 --- a/xen/arch/ia64/xen/domain.c	Fri May 12 09:03:04 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/domain.c	Fri May 12 10:21:57 2006 -0600
     1.3 @@ -168,7 +168,6 @@ struct vcpu *alloc_vcpu_struct(struct do
     1.4  	    	memset(&d->shared_info->evtchn_mask[0], 0xff,
     1.5  		    sizeof(d->shared_info->evtchn_mask));
     1.6  
     1.7 -	    v->vcpu_info = &(d->shared_info->vcpu_info[0]);
     1.8  	    v->arch.metaphysical_rr0 = d->arch.metaphysical_rr0;
     1.9  	    v->arch.metaphysical_rr4 = d->arch.metaphysical_rr4;
    1.10  	    v->arch.metaphysical_saved_rr0 = d->arch.metaphysical_rr0;
     2.1 --- a/xen/arch/ia64/xen/regionreg.c	Fri May 12 09:03:04 2006 -0600
     2.2 +++ b/xen/arch/ia64/xen/regionreg.c	Fri May 12 10:21:57 2006 -0600
     2.3 @@ -258,7 +258,7 @@ int set_one_rr(unsigned long rr, unsigne
     2.4  		if (!PSCB(v,metaphysical_mode))
     2.5  			set_rr(rr,newrrv.rrval);
     2.6  	} else if (rreg == 7) {
     2.7 -		ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info,
     2.8 +		ia64_new_rr7(vmMangleRID(newrrv.rrval),v->domain->shared_info,
     2.9  			     v->arch.privregs, v->domain->arch.shared_info_va,
    2.10  			     __get_cpu_var(vhpt_paddr));
    2.11  	} else {