Update ia64 patch to 2.5.69-030521, throwing away the parts included

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / kernel / pal.S

diff --git a/arch/ia64/kernel/pal.S b/arch/ia64/kernel/pal.S
index d440413..530d63d 100644 (file)
--- a/arch/ia64/kernel/pal.S
+++ b/arch/ia64/kernel/pal.S
@@ -164,7 +164,7 @@ GLOBAL_ENTRY(ia64_pal_call_phys_static)
        ;;
        mov loc4=ar.rsc                 // save RSE configuration
        dep.z loc2=loc2,0,61            // convert pal entry point to physical
-       dep.z r8=r8,0,61                // convert rp to physical
+       tpa r8=r8                       // convert rp to physical
        ;;
        mov b7 = loc2                   // install target to branch reg
        mov ar.rsc=0                    // put RSE in enforced lazy, LE mode
@@ -174,13 +174,13 @@ GLOBAL_ENTRY(ia64_pal_call_phys_static)
        or loc3=loc3,r17                // add in psr the bits to set
        ;;
        andcm r16=loc3,r16              // removes bits to clear from psr
-       br.call.sptk.many rp=ia64_switch_mode
+       br.call.sptk.many rp=ia64_switch_mode_phys
 .ret1: mov rp = r8                     // install return address (physical)
        br.cond.sptk.many b7
 1:
        mov ar.rsc=0                    // put RSE in enforced lazy, LE mode
        mov r16=loc3                    // r16= original psr
-       br.call.sptk.many rp=ia64_switch_mode // return to virtual mode
+       br.call.sptk.many rp=ia64_switch_mode_virt // return to virtual mode
 .ret2:
        mov psr.l = loc3                // restore init PSR
 
@@ -228,13 +228,13 @@ GLOBAL_ENTRY(ia64_pal_call_phys_stacked)
        mov b7 = loc2                   // install target to branch reg
        ;;
        andcm r16=loc3,r16              // removes bits to clear from psr
-       br.call.sptk.many rp=ia64_switch_mode
+       br.call.sptk.many rp=ia64_switch_mode_phys
 .ret6:
        br.call.sptk.many rp=b7         // now make the call
 .ret7:
        mov ar.rsc=0                    // put RSE in enforced lazy, LE mode
        mov r16=loc3                    // r16= original psr
-       br.call.sptk.many rp=ia64_switch_mode   // return to virtual mode
+       br.call.sptk.many rp=ia64_switch_mode_virt      // return to virtual mode
 
 .ret8: mov psr.l  = loc3               // restore init PSR
        mov ar.pfs = loc1