From efb1db15124e74983730bb12fb7a60ebf8c66cb7 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 8 Jul 2008 15:06:48 -0700
Subject: [PATCH] --- yaml --- r: 104420 b: refs/heads/master c:
 7d087b68d6ddb2398fb7f6e45990b7248de640ef h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5a571b81cc11..b7d2b1f934ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15664f968a95d8fbf4a0d7b462fcc20f88906bb3
+refs/heads/master: 7d087b68d6ddb2398fb7f6e45990b7248de640ef
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index dbe3549fad40..2b7bea3bb6f3 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1365,12 +1365,12 @@ asmlinkage void __init xen_start_kernel(void)
 	/* set the limit of our address space */
 	xen_reserve_top();
 
+#ifdef CONFIG_X86_32
 	/* set up basic CPUID stuff */
 	cpu_detect(&new_cpu_data);
-#ifdef CONFIG_X86_32
 	new_cpu_data.hard_math = 1;
-#endif
 	new_cpu_data.x86_capability[0] = cpuid_edx(1);
+#endif
 
 	/* Poke various useful things into boot_params */
 	boot_params.hdr.type_of_loader = (9 << 4) | 0;