Merge branch 'video' into release

[sfrench/cifs-2.6.git] / arch / ia64 / kernel / head.S

diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 23f846de62d58ae6e60a9c445911419daa4ff17f..1a6e44515eb42376f25902874c5eaa1810b9ade3 100644 (file)
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -167,7 +167,7 @@ RestRR:                                                                                     \
        mov _tmp2=((ia64_rid(IA64_REGION_ID_KERNEL, (num<<61)) << 8) | (pgsize << 2) | vhpt);; \
        mov rr[_tmp1]=_tmp2
 
-       .section __special_page_section,"ax"
+       __PAGE_ALIGNED_DATA
 
        .global empty_zero_page
 empty_zero_page:
@@ -181,7 +181,7 @@ swapper_pg_dir:
 halt_msg:
        stringz "Halting kernel\n"
 
-       .section .text.head,"ax"
+       __REF
 
        .global start_ap
 
@@ -1242,7 +1242,7 @@ GLOBAL_ENTRY(ia64_jump_to_sal)
        movl r16=SAL_PSR_BITS_TO_SET;;
        mov cr.ipsr=r16
        mov cr.ifs=r0;;
-       rfi;;
+       rfi;;                   // note: this unmask MCA/INIT (psr.mc)
 1:
        /*
         * Invalidate all TLB data/inst