Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5eaff3e authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: Kconfig: Drop obsolete NR_CPUS_DEFAULT_{1,2} options 



The NR_CPUS_DEFAULT_1 introduced as an aid for the QEMU
platform in 72ede9b1
"[MIPS] Qemu: Fix Symmetric Uniprocessor support"
which was later removed in
302922e5
"[MIPS] Qemu: Remove platform."

On certain randconfigs it may happen for NR_CPUS to have an
empty value because not all SMP platforms select a suitable
NR_CPUS_DEFAULT_* value. We fix this by restoring the range
of NR_CPUS to 2..64 and drop the NR_CPUS_DEFAULT_{1,2} symbols.
The first one is no longer used and the latter is not needed since
NR_CPUS=2 is now the default value.

Fixes the following problem on a randconfig:
.config:164:warning: symbol value '' invalid for NR_CPUS

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Acked-by: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5747/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c8acd40d

arch/mips/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ config BCM63XX 
	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348

	select NR_CPUS_DEFAULT_2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_HAS_EARLY_PRINTK
@@ -609,7 +608,6 @@ config SIBYTE_SWARM 
	select BOOT_ELF32

	select DMA_COHERENT

	select HAVE_PATA_PLATFORM

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -623,7 +621,6 @@ config SIBYTE_LITTLESUR 
	select BOOT_ELF32

	select DMA_COHERENT

	select HAVE_PATA_PLATFORM

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -635,7 +632,6 @@ config SIBYTE_SENTOSA 
	bool "Sibyte BCM91250E-Sentosa"

	select BOOT_ELF32

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -1862,7 +1858,6 @@ config MIPS_MT_SMP 
	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select MIPS_MT

	select NR_CPUS_DEFAULT_2

	select SMP

	select SYS_SUPPORTS_SCHED_SMT if SMP

	select SYS_SUPPORTS_SMP
@@ -2173,12 +2168,6 @@ config SYS_SUPPORTS_MIPS_CMP 
config SYS_SUPPORTS_SMP

	bool



config NR_CPUS_DEFAULT_1

	bool



config NR_CPUS_DEFAULT_2

	bool



config NR_CPUS_DEFAULT_4

	bool
@@ -2196,10 +2185,8 @@ config NR_CPUS_DEFAULT_64 


config NR_CPUS

	int "Maximum number of CPUs (2-64)"

	range 1 64 if NR_CPUS_DEFAULT_1

	range 2 64

	depends on SMP

	default "1" if NR_CPUS_DEFAULT_1

	default "2" if NR_CPUS_DEFAULT_2

	default "4" if NR_CPUS_DEFAULT_4

	default "8" if NR_CPUS_DEFAULT_8

	default "16" if NR_CPUS_DEFAULT_16