Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / head.S

diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 44d540efa6d1cc4efdce77a896e0aae928f2bab9..d3a41d5f8d1216dfd3a2b9e18f95208ec5aa6f92 100644 (file)
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -178,7 +178,7 @@ swapper_pg_dir:
 halt_msg:
        stringz "Halting kernel\n"
 
-       .text
+       .section .text.head,"ax"
 
        .global start_ap
 
@@ -392,6 +392,8 @@ self:       hint @pause
        br.sptk.many self               // endless loop
 END(_start)
 
+       .text
+
 GLOBAL_ENTRY(ia64_save_debug_regs)
        alloc r16=ar.pfs,1,0,0,0
        mov r20=ar.lc                   // preserve ar.lc
@@ -1174,6 +1176,7 @@ tlb_purge_done:
        RESTORE_REG(cr.dcr, r25, r17);;
        RESTORE_REG(cr.iva, r25, r17);;
        RESTORE_REG(cr.pta, r25, r17);;
+       srlz.d;;        // required not to violate RAW dependency
        RESTORE_REG(cr.itv, r25, r17);;
        RESTORE_REG(cr.pmv, r25, r17);;
        RESTORE_REG(cr.cmcv, r25, r17);;