diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /arch/x86/kernel/cpu/common.c | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index f86a3c4a2669..a38aafaefc23 100644 --- 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) | |||
| 504 | 504 | ||
| 505 | /* Clear all flags overriden by options */ | 505 | /* Clear all flags overriden by options */ |
| 506 | for (i = 0; i < NCAPINTS; i++) | 506 | for (i = 0; i < NCAPINTS; i++) |
| 507 | c->x86_capability[i] ^= cleared_cpu_caps[i]; | 507 | c->x86_capability[i] &= ~cleared_cpu_caps[i]; |
| 508 | 508 | ||
| 509 | /* Init Machine Check Exception if available. */ | 509 | /* Init Machine Check Exception if available. */ |
| 510 | mcheck_init(c); | 510 | mcheck_init(c); |