1 files changed, 9 insertions, 0 deletions

diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 2799baaadf45..b2f24d57fddd 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -184,7 +184,16 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
 
 static int __init x86_fxsr_setup(char * s)
 {
+        /* Tell all the other CPU's to not use it... */
         disable_x86_fxsr = 1;
+
+        /*
+         * ... and clear the bits early in the boot_cpu_data
+         * so that the bootup process doesn't try to do this
+         * either.
+         */
+        clear_bit(X86_FEATURE_FXSR, boot_cpu_data.x86_capability);
+        clear_bit(X86_FEATURE_XMM, boot_cpu_data.x86_capability);
         return 1;
 }
 __setup("nofxsr", x86_fxsr_setup);