[Xen-changelog] [xen-unstable] [IA64] vcpu_get_psr fix

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

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1167776384 25200
# Node ID a50fd1fed61ecb4909899010c0f44ac90d75f7aa
# Parent  80c5b5914b795b28249c8f7251ecd24b53186339
[IA64] vcpu_get_psr fix

mov r1=psr only return PSR{36:35,31:0}

Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>
---
 xen/arch/ia64/xen/vcpu.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -r 80c5b5914b79 -r a50fd1fed61e xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Wed Dec 20 14:55:02 2006 -0700
+++ b/xen/arch/ia64/xen/vcpu.c  Tue Jan 02 15:19:44 2007 -0700
@@ -450,8 +450,6 @@ IA64FAULT vcpu_get_psr(VCPU * vcpu, u64 
        struct ia64_psr newpsr;
 
        newpsr = *(struct ia64_psr *)&regs->cr_ipsr;
-       if (newpsr.cpl == 2)
-               newpsr.cpl = 0;
        if (!vcpu->vcpu_info->evtchn_upcall_mask)
                newpsr.i = 1;
        else
@@ -469,6 +467,7 @@ IA64FAULT vcpu_get_psr(VCPU * vcpu, u64 
        else
                newpsr.pp = 0;
        *pval = *(unsigned long *)&newpsr;
+       *pval &= (MASK(0, 32) | MASK(35, 2));
        return IA64_NO_FAULT;
 }
 

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