x86/asm/32: Add ENDs to some functions and relabel with SYM_CODE_*

[linux-2.6-block.git] / arch / x86 / realmode / rm / trampoline_32.S

diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
index 1868b158480d47af5f0e6c67fc5c88a4a08e94bc..3fad907a179f15ea64106dff118c13ec4e79b837 100644 (file)
--- a/arch/x86/realmode/rm/trampoline_32.S
+++ b/arch/x86/realmode/rm/trampoline_32.S
@@ -29,7 +29,7 @@
        .code16
 
        .balign PAGE_SIZE
-ENTRY(trampoline_start)
+SYM_CODE_START(trampoline_start)
        wbinvd                  # Needed for NUMA-Q should be harmless for others
 
        LJMPW_RM(1f)
@@ -54,18 +54,20 @@ ENTRY(trampoline_start)
        lmsw    %dx                     # into protected mode
 
        ljmpl   $__BOOT_CS, $pa_startup_32
+SYM_CODE_END(trampoline_start)
 
        .section ".text32","ax"
        .code32
-ENTRY(startup_32)                      # note: also used from wakeup_asm.S
+SYM_CODE_START(startup_32)                     # note: also used from wakeup_asm.S
        jmp     *%eax
+SYM_CODE_END(startup_32)
 
        .bss
        .balign 8
-GLOBAL(trampoline_header)
-       tr_start:               .space  4
-       tr_gdt_pad:             .space  2
-       tr_gdt:                 .space  6
-END(trampoline_header)
+SYM_DATA_START(trampoline_header)
+       SYM_DATA_LOCAL(tr_start,        .space 4)
+       SYM_DATA_LOCAL(tr_gdt_pad,      .space 2)
+       SYM_DATA_LOCAL(tr_gdt,          .space 6)
+SYM_DATA_END(trampoline_header)
        
 #include "trampoline_common.S"