From 77893566dfb8b9171f51d75bc813da8079411af3 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@redhat.com>
Date: Mon, 22 Sep 2008 14:35:08 -0300
Subject: [PATCH] --- yaml --- r: 113536 b: refs/heads/master c:
 e04d645f326bc8e591bc4ae21c4ab535987a17c1 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/cpu/common.c | 12 ++++++++++++
 trunk/arch/x86/kernel/time_64.c    |  4 ----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eb16b39a876a..b19392675982 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33c053d0aec344c8b2ad6966d904ebeff64e590b
+refs/heads/master: e04d645f326bc8e591bc4ae21c4ab535987a17c1
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index 088fbdb6734e..f1af71851919 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -719,12 +719,24 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 #endif
 }
 
+#ifdef CONFIG_X86_64
+static void vgetcpu_set_mode(void)
+{
+	if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP))
+		vgetcpu_mode = VGETCPU_RDTSCP;
+	else
+		vgetcpu_mode = VGETCPU_LSL;
+}
+#endif
+
 void __init identify_boot_cpu(void)
 {
 	identify_cpu(&boot_cpu_data);
 #ifdef CONFIG_X86_32
 	sysenter_setup();
 	enable_sep_cpu();
+#else
+	vgetcpu_set_mode();
 #endif
 }
 
diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c
index 207a7a1d7ac5..cb19d650c216 100644
--- a/trunk/arch/x86/kernel/time_64.c
+++ b/trunk/arch/x86/kernel/time_64.c
@@ -130,10 +130,6 @@ void __init hpet_time_init(void)
 void __init time_init(void)
 {
 	tsc_init();
-	if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP))
-		vgetcpu_mode = VGETCPU_RDTSCP;
-	else
-		vgetcpu_mode = VGETCPU_LSL;
 
 	late_time_init = choose_time_init();
 }