summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2010-07-17 09:03:28 -0400
committerH. Peter Anvin <hpa@zytor.com>2010-07-21 21:23:51 -0700
commit650fb4393dff543bc980d361555c489fbdeed088 (patch)
treed797faaa1448620e8c7132e8b81f2ad59c34e510 /arch
parentcfaa71ee9794472598d3966c3315cd6bd8f953d3 (diff)
downloadlinux-650fb4393dff543bc980d361555c489fbdeed088.tar.gz
linux-650fb4393dff543bc980d361555c489fbdeed088.tar.bz2
linux-650fb4393dff543bc980d361555c489fbdeed088.zip
x86-64: Simplify loading initial_gs
Load initial_gs as two 32-bit values instead of splitting a 64-bit value. Signed-off-by: Brian Gerst <brgerst@gmail.com> LKML-Reference: <1279371808-24804-3-git-send-email-brgerst@gmail.com> Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/head_64.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 3d1e6f16b7a6..239046bd447f 100644
--- a/arch/x86/kernel/head_64.S
+++ b/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.