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/x86_64/entry.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/x86_64/entry.S')
| -rw-r--r-- | xen/arch/x86/x86_64/entry.S | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 5beeccb647..f64e871c7c 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -272,8 +272,7 @@ ENTRY(sysenter_entry) pushq $FLAT_USER_SS pushq $0 pushfq - .globl sysenter_eflags_saved -sysenter_eflags_saved: +GLOBAL(sysenter_eflags_saved) pushq $3 /* ring 3 null cs */ pushq $0 /* null rip */ pushq $0 @@ -479,8 +478,7 @@ ENTRY(ret_from_intr) ENTRY(page_fault) movl $TRAP_page_fault,4(%rsp) /* No special register assumptions. */ - .globl handle_exception -handle_exception: +GLOBAL(handle_exception) SAVE_ALL handle_exception_saved: testb $X86_EFLAGS_IF>>8,UREGS_eflags+1(%rsp) @@ -689,11 +687,8 @@ ENTRY(enable_nmis) 1: retq -/* No op trap handler. Required for kexec crash path. This is not - * declared with the ENTRY() macro to avoid wasted alignment space. - */ -.globl trap_nop -trap_nop: +/* No op trap handler. Required for kexec crash path. */ +GLOBAL(trap_nop) iretq |