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/acpi | |
| 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/acpi')
| -rw-r--r-- | xen/arch/x86/acpi/wakeup_prot.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a1e706e2c8..def86d2f45 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -64,9 +64,8 @@ ENTRY(do_suspend_lowlevel) call acpi_enter_sleep_state jmp __ret_point - .align 16 - .globl __ret_point -__ret_point: + +ENTRY(__ret_point) /* mmu_cr4_features contains latest cr4 setting */ mov REF(mmu_cr4_features), GREG(ax) @@ -118,8 +117,9 @@ __ret_point: .data .align 16 - .globl saved_magic -saved_magic: .long 0x9abcdef0 + +GLOBAL(saved_magic) + .long 0x9abcdef0 saved_ss: .word 0 |