Merge branch 'perf/mce' into perf/core

Merge reason: It's ready for v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --combined arch/x86/kernel/setup.c
index 2a34f9c,179c1f2..c0ca8f9
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -109,6 -109,7 +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.
@@@ -660,13 -661,6 +661,13 @@@ static struct dmi_system_id __initdata 
                },
        },
        {
 +              .callback = dmi_low_memory_corruption,
 +              .ident = "Phoenix/MSC BIOS",
 +              .matches = {
 +                      DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix/MSC"),
 +              },
 +      },
 +      {
        /*
         * AMI BIOS with low memory corruption was found on Intel DG45ID board.
         * It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will
@@@ -1031,6 -1025,8 +1032,8 @@@ void __init setup_arch(char **cmdline_p
  #endif
  #endif
        x86_init.oem.banner();
+ 
+       mcheck_init();
  }
  
  #ifdef CONFIG_X86_32