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/trampoline.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/trampoline.S')
| -rw-r--r-- | xen/arch/x86/boot/trampoline.S | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index f84ce2a0f5..827f41219d 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -18,8 +18,7 @@ .long 111b - (off) - .; \ .popsection - .globl trampoline_realmode_entry -trampoline_realmode_entry: +GLOBAL(trampoline_realmode_entry) mov %cs,%ax mov %ax,%ds movb $0xA5,bootsym(trampoline_cpu_started) @@ -57,16 +56,13 @@ trampoline_gdt: .long trampoline_gdt + BOOT_PSEUDORM_DS + 2 - . .popsection - .globl cpuid_ext_features -cpuid_ext_features: +GLOBAL(cpuid_ext_features) .long 0 - .globl trampoline_xen_phys_start -trampoline_xen_phys_start: +GLOBAL(trampoline_xen_phys_start) .long 0 - .globl trampoline_cpu_started -trampoline_cpu_started: +GLOBAL(trampoline_cpu_started) .byte 0 .code32 @@ -206,8 +202,7 @@ trampoline_boot_cpu_entry: skip_realmode: .byte 0 - .globl kbd_shift_flags -kbd_shift_flags: +GLOBAL(kbd_shift_flags) .byte 0 rm_idt: .word 256*4-1, 0, 0 |