From: Andrew Cooper Date: Mon, 28 Apr 2014 10:46:11 +0000 (+0200) Subject: x86/boot: remove high_start and ret_point X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5132 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=82488001608bea1b87313de7888652f11037b085;p=xen.git x86/boot: remove high_start and ret_point They are not needed. This form is a few bytes leaner overall, but usefully removes pieces of data from the middle of the code section. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index 4f5f8d7f3d..ccb40fb4d8 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -109,12 +109,9 @@ trampoline_protmode_entry: .code64 start64: /* Jump to high mappings. */ - mov high_start(%rip),%rax + movabs $__high_start,%rax jmpq *%rax -high_start: - .quad __high_start - .code32 trampoline_boot_cpu_entry: cmpb $0,bootsym_rel(skip_realmode,5) diff --git a/xen/arch/x86/boot/wakeup.S b/xen/arch/x86/boot/wakeup.S index a3883c1431..08ea9b2c4a 100644 --- a/xen/arch/x86/boot/wakeup.S +++ b/xen/arch/x86/boot/wakeup.S @@ -166,12 +166,9 @@ wakeup_32: .code64 wakeup_64: /* Jump to high mappings and the higher-level wakeup code. */ - movq ret_point(%rip), %rbx + movabs $__ret_point, %rbx jmp *%rbx -ret_point: - .quad __ret_point - bogus_saved_magic: movw $0x0e00 + 'S', 0xb8014 jmp bogus_saved_magic