From: Rob Herring <rob.herring@calxeda.com>
Date: Fri, 22 Nov 2013 21:07:31 +0000 (+0000)
Subject: arm64: make default NR_CPUS 8
X-Git-Tag: firefly_0821_release~3680^2~35^2~1^2~67
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8751cf9a6c5f5bf02a2de8a4c025e09b38556df4;p=firefly-linux-kernel-4.4.55.git

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>
(cherry picked from commit 62aceb8ff4b3f442575eb7e23629da36020dca77)
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 0f24a8515841..dba7308041ad 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -152,8 +152,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"
 
 source kernel/Kconfig.preempt