x86: fix boot failure on 486 due to TSC breakage

[sfrench/cifs-2.6.git] / arch / x86 / kernel / setup_64.c

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 6fd804f0782145be3b45c223590c5c287a9bdb57..7637dc91c79bebac16365bbcff3b480c408584ef 100644 (file)
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -1021,7 +1021,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 
        /* Clear all flags overriden by options */
        for (i = 0; i < NCAPINTS; i++)
 
        /* Clear all flags overriden by options */
        for (i = 0; i < NCAPINTS; i++)

-               c->x86_capability[i] ^= cleared_cpu_caps[i];
+               c->x86_capability[i] &= ~cleared_cpu_caps[i];

 
 #ifdef CONFIG_X86_MCE
        mcheck_init(c);
 
 #ifdef CONFIG_X86_MCE
        mcheck_init(c);