From 0c1a1f4ca9ceac4a28c1137615ad2b6b51b13439 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 23 Aug 2016 21:05:13 +0100 Subject: [PATCH] Adjust max CPUs on ARM platforms to reflect newer real world hardware --- config-arm-generic | 1 - config-arm64 | 1 + config-armv7-generic | 1 + kernel.spec | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config-arm-generic b/config-arm-generic index bae4c1640..299dcf58a 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -31,7 +31,6 @@ CONFIG_INPUT_PWM_BEEPER=m CONFIG_ARM_SP805_WATCHDOG=m CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_NR_CPUS=8 CONFIG_SWIOTLB=y CONFIG_DMA_VIRTUAL_CHANNELS=y diff --git a/config-arm64 b/config-arm64 index 591a60a06..2290a24cd 100644 --- a/config-arm64 +++ b/config-arm64 @@ -43,6 +43,7 @@ CONFIG_CAVIUM_ERRATUM_27456=y # CONFIG_SERIAL_AMBA_PL010 is not set # CONFIG_AMBA_PL08X is not set CONFIG_ARM_SMMU_V3=y +CONFIG_NR_CPUS=256 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_REQUIRE_GPIOLIB=y diff --git a/config-armv7-generic b/config-armv7-generic index a8f26d36d..7c9c1d605 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -35,6 +35,7 @@ CONFIG_IRQ_CROSSBAR=y CONFIG_IOMMU_IO_PGTABLE_LPAE=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_ARM_CPU_SUSPEND=y +CONFIG_NR_CPUS=32 # CONFIG_MCPM is not set # CONFIG_OABI_COMPAT is not set diff --git a/kernel.spec b/kernel.spec index f9d2c3182..940c65a42 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2149,6 +2149,7 @@ fi * Tue Aug 23 2016 Peter Robinson - Qualcomm QDF2432 errata fix - Move to upstream patches for ACPI SPCR (serial console) +- Adjust max CPUs on ARM platforms to reflect newer real world hardware * Mon Aug 22 2016 Justin M. Forbes - 4.8.0-0.rc3.git0.1 - Linux v4.8-rc3