projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ff00594a2ed0897a0ecea9dbf58f289d5b0ccad2..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
.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)
wbinvd # Needed for NUMA-Q should be harmless for others
LJMPW_RM(1f)
@@
-54,11
+54,13
@@
ENTRY(trampoline_start)
lmsw %dx # into protected mode
ljmpl $__BOOT_CS, $pa_startup_32
lmsw %dx # into protected mode
ljmpl $__BOOT_CS, $pa_startup_32
+SYM_CODE_END(trampoline_start)
.section ".text32","ax"
.code32
.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
jmp *%eax
+SYM_CODE_END(startup_32)
.bss
.balign 8
.bss
.balign 8