From a6e573c8c61348f6c7273e901eb17f4356349edd Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Wed, 5 Nov 2008 02:27:19 +0900 Subject: [PATCH] --- yaml --- r: 120831 b: refs/heads/master c: fd51b2d7d5df932767b89e00d0871a38a2c53e74 h: refs/heads/master i: 120829: 5b2819714ee88685ebc6431947fc3687a3ccf696 120827: 30badd697bfff1106bdf8e4eb1e0036d1473c526 120823: acdb20c52ab8f6100859124661e8b6ac9d385d13 120815: dfee7990a136bfadb2b88f17044f46d64f841e16 120799: 49c1e58673c06ed8fa84527abbf9ba287d29ff32 120767: da16e8cf9eca1e520bca94547a4bb8d521befca2 120703: ece08ef645c32cfe52da80c0f670e5b9ea5fd29a 120575: 5667568d4378dab5bb1cede08a00267f09efa6a9 120319: e3a4434cffc07c13b2d2231387676e9852bfe484 119807: 0585e6c3f746da146717fef6805caa7566188d0c 118783: e9cfd9d0e9c7c1ce7a6051b7a72d180d1d5e5070 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6dab9c196837..0808f7e1645b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4f1b10365d4f03dd802433e0014cf503e6e930c +refs/heads/master: fd51b2d7d5df932767b89e00d0871a38a2c53e74 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 350bee1d54dc..38ae04bf6514 100644 --- a/trunk/arch/x86/Kconfig +++ b/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)