Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

* 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: make NUMA on 32-bit depend on EXPERIMENTAL again
  x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set

diff --combined arch/x86/Kconfig
index fd2de7019537dabe1c47f537237464c46f2438d2,4cf0ab13d187a943f88afc1d9761c739fee41008..ac22bb7719f730e6b8d12b305ec9e08952a513a4
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -167,12 -167,9 +167,12 @@@ config GENERIC_PENDING_IR
  config X86_SMP
        bool
        depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
 -      select USE_GENERIC_SMP_HELPERS
        default y
  
 +config USE_GENERIC_SMP_HELPERS
 +      def_bool y
 +      depends on SMP
 +
  config X86_32_SMP
        def_bool y
        depends on X86_32 && SMP
@@@ -960,7 -957,7 +960,7 @@@ config ARCH_PHYS_ADDR_T_64BI
  config NUMA
        bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
        depends on SMP
-       depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN)
+       depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
        default n if X86_PC
        default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
        help