From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 19 Aug 2019 13:16:53 +0000 (+0100)
Subject: x86/boot: Fold gdt_48 into the bottom of trampoline_gdt
X-Git-Tag: 4.14.0-rc1~861
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4599d472f187873ef4615a68b98f6ead3d07774a;p=xen.git

x86/boot: Fold gdt_48 into the bottom of trampoline_gdt

Saves 8 bytes in the trampoline.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S
index ef5baa31e0..4b9a9697e9 100644
--- a/xen/arch/x86/boot/trampoline.S
+++ b/xen/arch/x86/boot/trampoline.S
@@ -139,12 +139,13 @@ start64:
         .balign 8
         .word   0
 idt_48: .word   0, 0, 0 # base = limit = 0
-        .word   0
-gdt_48: .word   .Ltrampoline_gdt_end - trampoline_gdt - 1
-        .long   bootsym_rel(trampoline_gdt,4)
 
 trampoline_gdt:
-        .quad   0x0000000000000000 /* 0x0000: unused */
+        .word   0                  /* 0x0000: unused (reused for GDTR) */
+gdt_48:
+        .word   .Ltrampoline_gdt_end - trampoline_gdt - 1
+        .long   bootsym_rel(trampoline_gdt, 4)
+
         .quad   0x00cf9b000000ffff /* 0x0008: ring 0 code, 32-bit mode */
         .quad   0x00af9b000000ffff /* 0x0010: ring 0 code, 64-bit mode */
         .quad   0x00cf93000000ffff /* 0x0018: ring 0 data */