X86 Generic Architecture (X86_GENERICARCH) includes support for
Summit architecture. Enabling X86_GENERICARCH, SMP and HIGHMEM64G
allows NUMA to be selected but that configuration will not build
because it requires ACPI for the Summit NUMA support.
Fix:
require ACPI for NUMA support with X86_GENERICARCH
update the menu comment noting this
set default NR_CPUS to 32 for GENERICARCH (since it
includes BIGSMP and SUMMIT which default to 32)
Signed-off-by: Chuck Ebbert <[email protected]>
--- 2.6.17-mm6-nb.orig/arch/i386/Kconfig
+++ 2.6.17-mm6-nb/arch/i386/Kconfig
@@ -228,7 +228,7 @@ config NR_CPUS
int "Maximum number of CPUs (2-255)"
range 2 255
depends on SMP
- default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
+ default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 || X86_GENERICARCH
default "8"
help
This allows you to specify the maximum number of CPUs which this
@@ -546,15 +546,15 @@ 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 || (ACPI && (X86_GENERICARCH || X86_SUMMIT)))
default n if X86_PC
default y if (X86_NUMAQ || X86_SUMMIT)
help
NUMA support. Note this only works on IBM x440 or IBM NUMAQ.
Don't try to use it anywhere else.
-comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
- depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
+comment "NUMA (Summit, Generic arch) requires SMP, 64GB highmem support, ACPI"
+ depends on (X86_SUMMIT || X86_GENERICARCH) && (!HIGHMEM64G || !ACPI)
config NODES_SHIFT
int
--
Chuck
"You can't read a newspaper if you can't read." --George W. Bush
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
