From c0de433b86af1db093871f620d3b6061a307b6f5 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 24 Jan 2013 12:20:01 -0800 Subject: [PATCH] --- yaml --- r: 356245 b: refs/heads/master c: d3c433bf9a01b6951286ec2cbf52e3549623d878 h: refs/heads/master i: 356243: 9cb23bcc4c6f50694542b5ae21ca3810bdb2dd12 v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/compressed/head_64.S | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3f67df805f02..a6d9858e41ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 187a8a73cee295b9407de0d6bfba65471a1f39d6 +refs/heads/master: d3c433bf9a01b6951286ec2cbf52e3549623d878 diff --git a/trunk/arch/x86/boot/compressed/head_64.S b/trunk/arch/x86/boot/compressed/head_64.S index fb984c0c0c99..5c80b94f6c4a 100644 --- a/trunk/arch/x86/boot/compressed/head_64.S +++ b/trunk/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