diff options
| author | Andrew Cooper <andrew.cooper3@citrix.com> | 2013-09-09 10:25:40 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-09-09 10:25:40 +0200 |
| commit | ec98ab353db1bb665c3ec2f20007b294f2f51cd8 (patch) | |
| tree | 781bce237a73ec64eb0a9b60966603c0a8b1a2c1 /xen/arch/x86/boot/head.S | |
| parent | 110b2d6e8aa2a35d8f9d8efc3f3bfda3c49a3855 (diff) | |
| download | xen-ec98ab353db1bb665c3ec2f20007b294f2f51cd8.tar.gz xen-ec98ab353db1bb665c3ec2f20007b294f2f51cd8.tar.bz2 xen-ec98ab353db1bb665c3ec2f20007b294f2f51cd8.zip | |
x86: Introduce and use GLOBAL() in asm code
Also clean up some cases of misused/opencoded ENTRY()
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Diffstat (limited to 'xen/arch/x86/boot/head.S')
| -rw-r--r-- | xen/arch/x86/boot/head.S | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index d3cbddb349..b12eefb8be 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -195,11 +195,9 @@ __start: reloc: #include "reloc.S" - .align 16 - .globl trampoline_start, trampoline_end -trampoline_start: +ENTRY(trampoline_start) #include "trampoline.S" -trampoline_end: +GLOBAL(trampoline_end) .text __high_start: @@ -212,8 +210,7 @@ __high_start: * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte * of physical memory. In any case the VGA hole should be mapped with type UC. */ - .globl l1_identmap -l1_identmap: +GLOBAL(l1_identmap) pfn = 0 .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ |