[Xen-changelog] [IA64] bug fix (for SMP-g)

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID a7b7528c5ec19d2f0d1c3a7ddfa785304f8fe9ce
# Parent  304b3d9011c356d0d95b587f1069f9d4a68d6f4f
[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@xxxxxxxx>
---
 xen/arch/ia64/xen/domain.c    |    1 -
 xen/arch/ia64/xen/regionreg.c |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff -r 304b3d9011c3 -r a7b7528c5ec1 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Fri May 12 09:03:04 2006 -0600
+++ b/xen/arch/ia64/xen/domain.c        Fri May 12 10:21:57 2006 -0600
@@ -168,7 +168,6 @@ struct vcpu *alloc_vcpu_struct(struct do
                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 304b3d9011c3 -r a7b7528c5ec1 xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c     Fri May 12 09:03:04 2006 -0600
+++ b/xen/arch/ia64/xen/regionreg.c     Fri May 12 10:21:57 2006 -0600
@@ -258,7 +258,7 @@ int set_one_rr(unsigned long rr, unsigne
                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 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog