- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / kernel / cpu / bugs.c

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 46674fb..09087bd 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -17,6 +17,7 @@
 #include <asm/paravirt.h>
 #include <asm/alternative.h>
 
+#ifndef CONFIG_XEN
 static int __init no_halt(char *s)
 {
        WARN_ONCE(1, "\"no-hlt\" is deprecated, please use \"idle=poll\"\n");
@@ -25,6 +26,7 @@ static int __init no_halt(char *s)
 }
 
 __setup("no-hlt", no_halt);
+#endif
 
 static int __init no_387(char *s)
 {
@@ -84,13 +86,16 @@ static void __init check_fpu(void)
 
        kernel_fpu_end();
 
+#ifndef CONFIG_XEN
        boot_cpu_data.fdiv_bug = fdiv_bug;
        if (boot_cpu_data.fdiv_bug)
                printk(KERN_WARNING "Hmm, FPU with FDIV bug.\n");
+#endif
 }
 
 static void __init check_hlt(void)
 {
+#ifndef CONFIG_XEN
        if (boot_cpu_data.x86 >= 5 || paravirt_enabled())
                return;
 
@@ -104,6 +109,7 @@ static void __init check_hlt(void)
        halt();
        halt();
        printk(KERN_CONT "OK.\n");
+#endif
 }
 
 /*