Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix hwpoison code related build failure on 32-bit NUMAQ

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 93698794aa3a..8da93745c087 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -432,6 +432,17 @@ config X86_NUMAQ
           of Flat Logical.  You will need a new lynxer.elf file to flash your
           firmware with - send email to <Martin.Bligh@us.ibm.com>.
 
+config X86_SUPPORTS_MEMORY_FAILURE
+        bool
+        # MCE code calls memory_failure():
+        depends on X86_MCE
+        # On 32-bit this adds too big of NODES_SHIFT and we run out of page flags:
+        depends on !X86_NUMAQ
+        # On 32-bit SPARSEMEM adds too big of SECTIONS_WIDTH:
+        depends on X86_64 || !SPARSEMEM
+        select ARCH_SUPPORTS_MEMORY_FAILURE
+        default y
+
 config X86_VISWS
         bool "SGI 320/540 (Visual Workstation)"
         depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT