[Xen-changelog] serial port back to work again

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1709.1.13, 2005/06/16 12:23:16-06:00, djm@xxxxxxxxxxxxxxx

        serial port back to work again
        
        Signed-off-by Kevin Tian <Kevin.tian@xxxxxxxxx>



 vmx_ivt.S |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


diff -Nru a/xen/arch/ia64/vmx_ivt.S b/xen/arch/ia64/vmx_ivt.S
--- a/xen/arch/ia64/vmx_ivt.S   2005-06-19 14:05:09 -04:00
+++ b/xen/arch/ia64/vmx_ivt.S   2005-06-19 14:05:09 -04:00
@@ -249,9 +249,9 @@
        movl r19=(((1 << IA64_MAX_PHYS_BITS) - 1) & ~0xfff)
        ;;
        and r19=r19,r16         // clear ed, reserved bits, and PTE control bits
-       shr.u r18=r16,57        // move address bit 61 to bit 4
+       shr.u r18=r16,55        // move address bit 59 to bit 4
        ;;
-       andcm r18=0x10,r18      // bit 4=~address-bit(61)
+       and r18=0x10,r18        // bit 4=address-bit(61)
        or r19=r17,r19          // insert PTE control bits into r19
        ;;
        or r19=r19,r18          // set bit 4 (uncached) if the access was to 
region 6
@@ -280,11 +280,11 @@
        ;;
        and r22=IA64_ISR_CODE_MASK,r20          // get the isr.code field
        tbit.nz p6,p7=r20,IA64_ISR_SP_BIT       // is speculation bit on?
-       shr.u r18=r16,57                        // move address bit 61 to bit 4
+       shr.u r18=r16,55                        // move address bit 59 to bit 4
        and r19=r19,r16                         // clear ed, reserved bits, and 
PTE control bits
        tbit.nz p9,p0=r20,IA64_ISR_NA_BIT       // is non-access bit on?
        ;;
-       andcm r18=0x10,r18      // bit 4=~address-bit(61)
+       and r18=0x10,r18        // bit 4=address-bit(61)
 (p9) cmp.eq.or.andcm p6,p7=IA64_ISR_CODE_LFETCH,r22    // check isr.code field
        dep r24=-1,r24,IA64_PSR_ED_BIT,1
        or r19=r19,r17          // insert PTE control bits into r19

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