Messages in this thread Patch in this message |  | | From | Yinghai Lu <> | Subject | [PATCH v6 04/27] x86, boot: Move lldt/ltr out of 64bit code section | Date | Thu, 13 Dec 2012 14:01:58 -0800 |
| |
commit 08da5a2ca
x86_64: Early segment setup for VT
add lldt/ltr to clean more segments.
Those code are put in code64, and it is using gdt that is only loaded from code32 path.
That breaks booting with 64bit bootloader that does not go through code32 path. It get at startup_64 directly, and it has different gdt.
Move those lines into code32 after their gdt is loaded.
Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Zachary Amsden <zamsden@gmail.com> Cc: Matt Fleming <matt.fleming@intel.com> --- arch/x86/boot/compressed/head_64.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index fb984c0..5c80b94 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -154,6 +154,12 @@ ENTRY(startup_32) btsl $_EFER_LME, %eax wrmsr + /* After gdt is loaded */ + xorl %eax, %eax + lldt %ax + movl $0x20, %eax + ltr %ax + /* * Setup for the jump to 64bit mode * @@ -239,9 +245,6 @@ preferred_addr: movl %eax, %ss movl %eax, %fs movl %eax, %gs - lldt %ax - movl $0x20, %eax - ltr %ax /* * Compute the decompressed kernel start address. It is where -- 1.7.10.4
|  |