diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-03 20:10:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-03 20:11:06 +0100 |
| commit | 26fb20d008d841268545c25bb183f21ed16db891 (patch) | |
| tree | 4e14dc653d0e6b5d43c2bb8f55b795b232200698 /arch/x86/kernel/cpu/common.c | |
| parent | 23ba90e328fd2326378447cafafa47defdfc83c2 (diff) | |
| parent | 767df1bdd8cbff2c8c40c9ac8295bbdaa5fb24c4 (diff) | |
Merge branch 'perf/mce' into perf/core
Merge reason: It's ready for v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index cc25c2b4a56..9053be5d95c 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -837,10 +837,8 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; } -#ifdef CONFIG_X86_MCE /* Init Machine Check Exception if available. */ - mcheck_init(c); -#endif + mcheck_cpu_init(c); select_idle_routine(c); |