---

yaml
---
r: 120831
b: refs/heads/master
c: fd51b2d
h: refs/heads/master
i:
  120829: 5b28197
  120827: 30badd6
  120823: acdb20c
  120815: dfee799
  120799: 49c1e58
  120767: da16e8c
  120703: ece08ef
  120575: 5667568
  120319: e3a4434
  119807: 0585e6c
  118783: e9cfd9d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4f1b10365d4f03dd802433e0014cf503e6e930c
+refs/heads/master: fd51b2d7d5df932767b89e00d0871a38a2c53e74

trunk/arch/x86/Kconfig

@@ -951,22 +951,26 @@ config ARCH_PHYS_ADDR_T_64BIT
 
 # Common NUMA Features
 config NUMA
-	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
+	bool "Numa Memory Allocation and Scheduler Support"
 	depends on SMP
 	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
 	  Enable NUMA (Non Uniform Memory Access) support.
+
 	  The kernel will try to allocate memory used by a CPU on the
 	  local memory controller of the CPU and add some more
 	  NUMA awareness to the kernel.
 
-	  For 32-bit this is currently highly experimental and should be only
-	  used for kernel development. It might also cause boot failures.
-	  For 64-bit this is recommended on all multiprocessor Opteron systems.
-	  If the system is EM64T, you should say N unless your system is
-	  EM64T NUMA.
+	  For 64-bit this is recommended if the system is Intel Core 7i
+	  (or later), AMD Opteron, or EM64T NUMA.
+
+	  For 32-bit this is only needed on (rare) 32-bit-only platforms
+	  that support NUMA topologies, such as NUMAQ / Summit, or if you
+	  boot a 32-bit kernel on a 64-bit NUMA platform.
+
+	  Otherwise, you should say N.
 
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
 	depends on X86_32 && X86_SUMMIT && (!HIGHMEM64G || !ACPI)