summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-11-22 22:07:31 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2013-12-06 18:21:50 +0100
commit62aceb8ff4b3f442575eb7e23629da36020dca77 (patch)
treebef9ad23bdceb76f0db81414cb0de32f23806864 /arch
parentarm64: ensure completion of TLB invalidatation (diff)
downloadlinux-62aceb8ff4b3f442575eb7e23629da36020dca77.tar.xz
linux-62aceb8ff4b3f442575eb7e23629da36020dca77.zip
arm64: make default NR_CPUS 8
Rather than continue to add per platform defaults, make the default a likely common core count. 8 is also the default for x86. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 88c8b6c1341a..6d4dd22ee4b7 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -159,8 +159,7 @@ config NR_CPUS
range 2 32
depends on SMP
# These have to remain sorted largest to smallest
- default "8" if ARCH_XGENE
- default "4"
+ default "8"
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs"