From 7db2d8332a8365fcecd59f0c191571c175f95c5a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 3 Oct 2006 09:45:46 -0700 Subject: [PATCH] --- yaml --- r: 38232 b: refs/heads/master c: 8ccb3dcd1f8e80e8702642e1de26541b52f6bb7c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/common.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7b800e840b99..5480b499eaea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63c422afe3739b68bec0b5c42807d1450c951caf +refs/heads/master: 8ccb3dcd1f8e80e8702642e1de26541b52f6bb7c diff --git a/trunk/arch/i386/kernel/cpu/common.c b/trunk/arch/i386/kernel/cpu/common.c index 2799baaadf45..b2f24d57fddd 100644 --- a/trunk/arch/i386/kernel/cpu/common.c +++ b/trunk/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);