From b66ff984e4190905e5925b9e0d598abff126aed1 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 11 Sep 2008 16:42:00 -0700
Subject: [PATCH] --- yaml --- r: 109878 b: refs/heads/master c:
 0ad5bce7409d681a5655c66e64bb0eb740b89c1f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de4abda781f3..7d984cf9b6c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f461a1d80c865e5ec4d24107adbab8b010b60e32
+refs/heads/master: 0ad5bce7409d681a5655c66e64bb0eb740b89c1f
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 362d4e7f2d38..9838f2539dfc 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -670,6 +670,10 @@ void __init setup_arch(char **cmdline_p)
 
 	parse_early_param();
 
+#ifdef CONFIG_X86_64
+	check_efer();
+#endif
+
 #if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
 	/*
 	 * Must be before kernel pagetables are setup
@@ -738,7 +742,6 @@ void __init setup_arch(char **cmdline_p)
 #else
 	num_physpages = max_pfn;
 
-	check_efer();
 
 	/* How many end-of-memory variables you have, grandma! */
 	/* need this before calling reserve_initrd */