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/setup.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/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 2a34f9c5be2..c0ca8f921c9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -109,6 +109,7 @@ #ifdef CONFIG_X86_64 #include <asm/numa_64.h> #endif +#include <asm/mce.h> /* * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. @@ -1031,6 +1032,8 @@ void __init setup_arch(char **cmdline_p) #endif #endif x86_init.oem.banner(); + + mcheck_init(); } #ifdef CONFIG_X86_32 |