Merge branch 'x86/mce2' into x86/core

diff --combined arch/x86/Kconfig
index f5cef3fbf9a5b21588b71add9f3abff0af847e99,3afc94abe357a342ae8526d1874f75348280f5bb..31758378bcd2707f7dd2803ecd9a98d2d9a9a063
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -40,9 -40,6 +40,9 @@@ config X8
        select HAVE_GENERIC_DMA_COHERENT if X86_32
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select USER_STACKTRACE_SUPPORT
 +      select HAVE_KERNEL_GZIP
 +      select HAVE_KERNEL_BZIP2
 +      select HAVE_KERNEL_LZMA
  
  config ARCH_DEFCONFIG
        string
@@@ -138,9 -135,6 +138,9 @@@ config ARCH_HAS_CACHE_LINE_SIZ
  config HAVE_SETUP_PER_CPU_AREA
        def_bool y
  
 +config HAVE_DYNAMIC_PER_CPU_AREA
 +      def_bool y
 +
  config HAVE_CPUMASK_OF_CPU_MAP
        def_bool X86_64_SMP
  
@@@ -783,6 -777,11 +783,11 @@@ config X86_MCE_AM
           Additional support for AMD specific MCE features such as
           the DRAM Error Threshold.
  
+ config X86_MCE_THRESHOLD
+       depends on X86_MCE_AMD || X86_MCE_INTEL
+       bool
+       default y
+ 
  config X86_MCE_NONFATAL
        tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
        depends on X86_32 && X86_MCE
@@@ -1128,7 -1127,7 +1133,7 @@@ config NODES_SHIF
          Specify the maximum number of NUMA Nodes available on the target
          system.  Increases memory reserved to accomodate various tables.
  
 -config HAVE_ARCH_BOOTMEM_NODE
 +config HAVE_ARCH_BOOTMEM
        def_bool y
        depends on X86_32 && NUMA