From f146fc16588459ba817bd3f276e97827dbf262d8 Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Sat, 17 Jul 2010 09:03:28 -0400
Subject: [PATCH] --- yaml --- r: 205479 b: refs/heads/master c:
 650fb4393dff543bc980d361555c489fbdeed088 h: refs/heads/master i:   205477:
 a681bea53198158879d80e77549c92be4d26a144   205475:
 a0f9e5ff96163912d0e0f5440eeeeafd9b1582c7   205471:
 dc0eb2d56111e24851bbb76dddd45b6a52c646f9 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/head_64.S | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b7785fe6e508..ba77d4d4c4f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfaa71ee9794472598d3966c3315cd6bd8f953d3
+refs/heads/master: 650fb4393dff543bc980d361555c489fbdeed088
diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S
index 3d1e6f16b7a6..239046bd447f 100644
--- a/trunk/arch/x86/kernel/head_64.S
+++ b/trunk/arch/x86/kernel/head_64.S
@@ -234,9 +234,8 @@ ENTRY(secondary_startup_64)
 	 * init data section till per cpu areas are set up.
 	 */
 	movl	$MSR_GS_BASE,%ecx
-	movq	initial_gs(%rip),%rax
-	movq    %rax,%rdx
-	shrq	$32,%rdx
+	movl	initial_gs(%rip),%eax
+	movl	initial_gs+4(%rip),%edx
 	wrmsr	
 
 	/* esi is pointer to real mode structure with interesting info.