git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86: fix boot failure on 486 due to TSC breakage
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
common.c
diff --git
a/arch/x86/kernel/cpu/common.c
b/arch/x86/kernel/cpu/common.c
index f86a3c4a2669909be340d195a6ee93201c53cdf9..a38aafaefc230b4bfc49c34c98fc2c443fff8318 100644
(file)
--- a/
arch/x86/kernel/cpu/common.c
+++ b/
arch/x86/kernel/cpu/common.c
@@
-504,7
+504,7
@@
void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
/* 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];
/* Init Machine Check Exception if available. */
mcheck_init(c);