From 6f7dc545dfb74550947b25bb0c21ce2cce61349f Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Sun, 27 Aug 2006 01:24:00 -0700 Subject: [PATCH] --- yaml --- r: 33655 b: refs/heads/master c: 38e716aa016dfd8466c11500c56ab7773344fdf7 h: refs/heads/master i: 33653: e46eb10f5c2080369f9a54d04c7a9ce03d34c811 33651: f18978bbf267036ed41f8d0fb2cf7c05eb726a18 33647: 0e0c5ad96edae0b05527b0e2c7e6e1fa6b19ff1b v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81c8381203e6..8f64c5eb5bb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5ef68da5fda5e095b585ea5ecdd42af3c8695f7 +refs/heads/master: 38e716aa016dfd8466c11500c56ab7773344fdf7 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index f71fb4a029cb..b2751eadbc56 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -142,6 +142,7 @@ config X86_SUMMIT In particular, it is needed for the x440. If you don't have one of these computers, you should say N here. + If you want to build a NUMA kernel, you must select ACPI. config X86_BIGSMP bool "Support for other sub-arch SMP systems with more than 8 CPUs" @@ -169,6 +170,7 @@ config X86_GENERICARCH help This option compiles in the Summit, bigsmp, ES7000, default subarchitectures. It is intended for a generic binary kernel. + If you want a NUMA kernel, select ACPI. We need SRAT for NUMA. config X86_ES7000 bool "Support for Unisys ES7000 IA32 series" @@ -542,7 +544,7 @@ config X86_PAE # Common NUMA Features config NUMA bool "Numa Memory Allocation and Scheduler Support" - depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI)) + depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) default n if X86_PC default y if (X86_NUMAQ || X86_SUMMIT)