aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-07-08 18:06:48 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-16 04:59:38 -0400
commit7d087b68d6ddb2398fb7f6e45990b7248de640ef (patch)
treeb68bf7a12016df8504095ddfff4c40b975197f70
parent15664f968a95d8fbf4a0d7b462fcc20f88906bb3 (diff)
xen: cpu_detect is 32-bit only
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Stephen Tweedie <sct@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/xen/enlighten.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index dbe3549fad40..2b7bea3bb6f3 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1365,12 +1365,12 @@ asmlinkage void __init xen_start_kernel(void)
1365 /* set the limit of our address space */ 1365 /* set the limit of our address space */
1366 xen_reserve_top(); 1366 xen_reserve_top();
1367 1367
1368#ifdef CONFIG_X86_32
1368 /* set up basic CPUID stuff */ 1369 /* set up basic CPUID stuff */
1369 cpu_detect(&new_cpu_data); 1370 cpu_detect(&new_cpu_data);
1370#ifdef CONFIG_X86_32
1371 new_cpu_data.hard_math = 1; 1371 new_cpu_data.hard_math = 1;
1372#endif
1373 new_cpu_data.x86_capability[0] = cpuid_edx(1); 1372 new_cpu_data.x86_capability[0] = cpuid_edx(1);
1373#endif
1374 1374
1375 /* Poke various useful things into boot_params */ 1375 /* Poke various useful things into boot_params */
1376 boot_params.hdr.type_of_loader = (9 << 4) | 0; 1376 boot_params.hdr.type_of_loader = (9 << 4) | 0;