mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
MIPS: Kconfig: Drop obsolete NR_CPUS_DEFAULT_{1,2} options
The NR_CPUS_DEFAULT_1 introduced as an aid for the QEMU platform in72ede9b189
"[MIPS] Qemu: Fix Symmetric Uniprocessor support" which was later removed in302922e5f6
"[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: Markos Chandras <markos.chandras@imgtec.com> Acked-by: Steven J. Hill <Steven.Hill@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/5747/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
c8acd40d38
commit
c5eaff3e85
|
@ -131,7 +131,6 @@ config BCM63XX
|
||||||
select IRQ_CPU
|
select IRQ_CPU
|
||||||
select SYS_HAS_CPU_MIPS32_R1
|
select SYS_HAS_CPU_MIPS32_R1
|
||||||
select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
|
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_32BIT_KERNEL
|
||||||
select SYS_SUPPORTS_BIG_ENDIAN
|
select SYS_SUPPORTS_BIG_ENDIAN
|
||||||
select SYS_HAS_EARLY_PRINTK
|
select SYS_HAS_EARLY_PRINTK
|
||||||
|
@ -609,7 +608,6 @@ config SIBYTE_SWARM
|
||||||
select BOOT_ELF32
|
select BOOT_ELF32
|
||||||
select DMA_COHERENT
|
select DMA_COHERENT
|
||||||
select HAVE_PATA_PLATFORM
|
select HAVE_PATA_PLATFORM
|
||||||
select NR_CPUS_DEFAULT_2
|
|
||||||
select SIBYTE_SB1250
|
select SIBYTE_SB1250
|
||||||
select SWAP_IO_SPACE
|
select SWAP_IO_SPACE
|
||||||
select SYS_HAS_CPU_SB1
|
select SYS_HAS_CPU_SB1
|
||||||
|
@ -623,7 +621,6 @@ config SIBYTE_LITTLESUR
|
||||||
select BOOT_ELF32
|
select BOOT_ELF32
|
||||||
select DMA_COHERENT
|
select DMA_COHERENT
|
||||||
select HAVE_PATA_PLATFORM
|
select HAVE_PATA_PLATFORM
|
||||||
select NR_CPUS_DEFAULT_2
|
|
||||||
select SIBYTE_SB1250
|
select SIBYTE_SB1250
|
||||||
select SWAP_IO_SPACE
|
select SWAP_IO_SPACE
|
||||||
select SYS_HAS_CPU_SB1
|
select SYS_HAS_CPU_SB1
|
||||||
|
@ -635,7 +632,6 @@ config SIBYTE_SENTOSA
|
||||||
bool "Sibyte BCM91250E-Sentosa"
|
bool "Sibyte BCM91250E-Sentosa"
|
||||||
select BOOT_ELF32
|
select BOOT_ELF32
|
||||||
select DMA_COHERENT
|
select DMA_COHERENT
|
||||||
select NR_CPUS_DEFAULT_2
|
|
||||||
select SIBYTE_SB1250
|
select SIBYTE_SB1250
|
||||||
select SWAP_IO_SPACE
|
select SWAP_IO_SPACE
|
||||||
select SYS_HAS_CPU_SB1
|
select SYS_HAS_CPU_SB1
|
||||||
|
@ -1862,7 +1858,6 @@ config MIPS_MT_SMP
|
||||||
select CPU_MIPSR2_IRQ_VI
|
select CPU_MIPSR2_IRQ_VI
|
||||||
select CPU_MIPSR2_IRQ_EI
|
select CPU_MIPSR2_IRQ_EI
|
||||||
select MIPS_MT
|
select MIPS_MT
|
||||||
select NR_CPUS_DEFAULT_2
|
|
||||||
select SMP
|
select SMP
|
||||||
select SYS_SUPPORTS_SCHED_SMT if SMP
|
select SYS_SUPPORTS_SCHED_SMT if SMP
|
||||||
select SYS_SUPPORTS_SMP
|
select SYS_SUPPORTS_SMP
|
||||||
|
@ -2173,12 +2168,6 @@ config SYS_SUPPORTS_MIPS_CMP
|
||||||
config SYS_SUPPORTS_SMP
|
config SYS_SUPPORTS_SMP
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config NR_CPUS_DEFAULT_1
|
|
||||||
bool
|
|
||||||
|
|
||||||
config NR_CPUS_DEFAULT_2
|
|
||||||
bool
|
|
||||||
|
|
||||||
config NR_CPUS_DEFAULT_4
|
config NR_CPUS_DEFAULT_4
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -2196,10 +2185,8 @@ config NR_CPUS_DEFAULT_64
|
||||||
|
|
||||||
config NR_CPUS
|
config NR_CPUS
|
||||||
int "Maximum number of CPUs (2-64)"
|
int "Maximum number of CPUs (2-64)"
|
||||||
range 1 64 if NR_CPUS_DEFAULT_1
|
range 2 64
|
||||||
depends on SMP
|
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 "4" if NR_CPUS_DEFAULT_4
|
||||||
default "8" if NR_CPUS_DEFAULT_8
|
default "8" if NR_CPUS_DEFAULT_8
|
||||||
default "16" if NR_CPUS_DEFAULT_16
|
default "16" if NR_CPUS_DEFAULT_16
|
||||||
|
|
Loading…
Reference in a new issue