ChangeSet 1.1668.1.2, 2005/06/06 12:05:03-06:00, djm@xxxxxxxxxxxxxxx
Merge corrections
domain.c | 2 +-
hyperprivop.S | 4 ++--
privop.c | 2 +-
regionreg.c | 12 +++++-------
4 files changed, 9 insertions(+), 11 deletions(-)
diff -Nru a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
--- a/xen/arch/ia64/domain.c 2005-06-10 14:03:48 -04:00
+++ b/xen/arch/ia64/domain.c 2005-06-10 14:03:48 -04:00
@@ -257,7 +257,7 @@
d->xen_vaend = 0xf300000000000000;
d->shared_info_va = 0xf100000000000000;
d->arch.breakimm = 0x1000;
- ed->arch.breakimm = d->arch.breakimm;
+ v->arch.breakimm = d->arch.breakimm;
// stay on kernel stack because may get interrupts!
// ia64_ret_from_clone (which b0 gets in new_thread) switches
// to user stack
diff -Nru a/xen/arch/ia64/hyperprivop.S b/xen/arch/ia64/hyperprivop.S
--- a/xen/arch/ia64/hyperprivop.S 2005-06-10 14:03:48 -04:00
+++ b/xen/arch/ia64/hyperprivop.S 2005-06-10 14:03:48 -04:00
@@ -90,7 +90,7 @@
mov cr.ipsr=r20;;
// save ipsr in shared_info, vipsr.cpl==(ipsr.cpl==3)?3:0
cmp.ne p7,p0=3,r21;;
-(p7) mov r21=r0
+(p7) mov r21=r0 ;;
dep r20=r21,r20,IA64_PSR_CPL0_BIT,2 ;;
dep r20=r23,r20,IA64_PSR_RI_BIT,2 ;;
// vipsr.i=vpsr.i
@@ -110,7 +110,7 @@
// save ifs in shared_info
adds r21=XSI_INCOMPL_REG_OFS-XSI_PSR_IC_OFS,r18 ;;
st4 [r21]=r0 ;;
- adds r21=XSI_IFS_OFS-XSI_PSR_IC_OFS,r18
+ adds r21=XSI_IFS_OFS-XSI_PSR_IC_OFS,r18 ;;
st8 [r21]=r0 ;;
cover ;;
mov r20=cr.ifs;;
diff -Nru a/xen/arch/ia64/privop.c b/xen/arch/ia64/privop.c
--- a/xen/arch/ia64/privop.c 2005-06-10 14:03:48 -04:00
+++ b/xen/arch/ia64/privop.c 2005-06-10 14:03:48 -04:00
@@ -795,7 +795,7 @@
(void)priv_itc_i(v,inst);
return 1;
case HYPERPRIVOP_SSM_I:
- (void)vcpu_set_psr_i(ed);
+ (void)vcpu_set_psr_i(v);
return 1;
}
return 0;
diff -Nru a/xen/arch/ia64/regionreg.c b/xen/arch/ia64/regionreg.c
--- a/xen/arch/ia64/regionreg.c 2005-06-10 14:03:48 -04:00
+++ b/xen/arch/ia64/regionreg.c 2005-06-10 14:03:48 -04:00
@@ -287,7 +287,7 @@
if (rreg == 6) newrrv.ve = VHPT_ENABLED_REGION_7;
else newrrv.ve = VHPT_ENABLED_REGION_0_TO_6;
newrrv.ps = PAGE_SHIFT;
- if (rreg == 0) ed->arch.metaphysical_saved_rr0 = newrrv.rrval;
+ if (rreg == 0) v->arch.metaphysical_saved_rr0 = newrrv.rrval;
set_rr(rr,newrrv.rrval);
}
return 1;
@@ -296,11 +296,11 @@
// set rr0 to the passed rid (for metaphysical mode so don't use domain offset
int set_metaphysical_rr0(void)
{
- struct exec_domain *ed = current;
+ struct vcpu *v = current;
ia64_rr rrv;
// rrv.ve = 1; FIXME: TURN ME BACK ON WHEN VHPT IS WORKING
- set_rr(0,ed->arch.metaphysical_rr0);
+ set_rr(0,v->arch.metaphysical_rr0);
}
// validates/changes region registers 0-6 in the currently executing domain
@@ -325,8 +325,7 @@
ia64_rr rrv;
rrv.rrval = 0;
- rrv.rid = v->domain->metaphysical_rid;
- rrv.rrval = ed->domain->arch.metaphysical_rr0;
+ rrv.rrval = v->domain->arch.metaphysical_rr0;
rrv.ps = PAGE_SHIFT;
rrv.ve = 1;
if (!v->vcpu_info) { printf("Stopping in init_all_rr\n"); dummy(); }
@@ -380,9 +379,8 @@
ia64_rr rrv;
rrv.rrval = 0;
- rrv.rid = v->domain->metaphysical_rid;
+ rrv.rid = v->domain->arch.metaphysical_rr0;
rrv.ps = PAGE_SHIFT;
- rrv.rrval = v->domain->arch.metaphysical_rr0;
rrv.ve = 1;
rr0 = rrv.rrval;
set_rr_no_srlz(0x0000000000000000L, rr0);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home