diff options
| -rw-r--r-- | arch/mips/Kconfig | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e12764c2a9d0..b69b4e4f55df 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -131,7 +131,6 @@ config BCM63XX | |||
| 131 | select IRQ_CPU | 131 | select IRQ_CPU |
| 132 | select SYS_HAS_CPU_MIPS32_R1 | 132 | select SYS_HAS_CPU_MIPS32_R1 |
| 133 | select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348 | 133 | select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348 |
| 134 | select NR_CPUS_DEFAULT_2 | ||
| 135 | select SYS_SUPPORTS_32BIT_KERNEL | 134 | select SYS_SUPPORTS_32BIT_KERNEL |
| 136 | select SYS_SUPPORTS_BIG_ENDIAN | 135 | select SYS_SUPPORTS_BIG_ENDIAN |
| 137 | select SYS_HAS_EARLY_PRINTK | 136 | select SYS_HAS_EARLY_PRINTK |
| @@ -609,7 +608,6 @@ config SIBYTE_SWARM | |||
| 609 | select BOOT_ELF32 | 608 | select BOOT_ELF32 |
| 610 | select DMA_COHERENT | 609 | select DMA_COHERENT |
| 611 | select HAVE_PATA_PLATFORM | 610 | select HAVE_PATA_PLATFORM |
| 612 | select NR_CPUS_DEFAULT_2 | ||
| 613 | select SIBYTE_SB1250 | 611 | select SIBYTE_SB1250 |
| 614 | select SWAP_IO_SPACE | 612 | select SWAP_IO_SPACE |
| 615 | select SYS_HAS_CPU_SB1 | 613 | select SYS_HAS_CPU_SB1 |
| @@ -623,7 +621,6 @@ config SIBYTE_LITTLESUR | |||
| 623 | select BOOT_ELF32 | 621 | select BOOT_ELF32 |
| 624 | select DMA_COHERENT | 622 | select DMA_COHERENT |
| 625 | select HAVE_PATA_PLATFORM | 623 | select HAVE_PATA_PLATFORM |
| 626 | select NR_CPUS_DEFAULT_2 | ||
| 627 | select SIBYTE_SB1250 | 624 | select SIBYTE_SB1250 |
| 628 | select SWAP_IO_SPACE | 625 | select SWAP_IO_SPACE |
| 629 | select SYS_HAS_CPU_SB1 | 626 | select SYS_HAS_CPU_SB1 |
| @@ -635,7 +632,6 @@ config SIBYTE_SENTOSA | |||
| 635 | bool "Sibyte BCM91250E-Sentosa" | 632 | bool "Sibyte BCM91250E-Sentosa" |
| 636 | select BOOT_ELF32 | 633 | select BOOT_ELF32 |
| 637 | select DMA_COHERENT | 634 | select DMA_COHERENT |
| 638 | select NR_CPUS_DEFAULT_2 | ||
| 639 | select SIBYTE_SB1250 | 635 | select SIBYTE_SB1250 |
| 640 | select SWAP_IO_SPACE | 636 | select SWAP_IO_SPACE |
| 641 | select SYS_HAS_CPU_SB1 | 637 | select SYS_HAS_CPU_SB1 |
| @@ -1862,7 +1858,6 @@ config MIPS_MT_SMP | |||
| 1862 | select CPU_MIPSR2_IRQ_VI | 1858 | select CPU_MIPSR2_IRQ_VI |
| 1863 | select CPU_MIPSR2_IRQ_EI | 1859 | select CPU_MIPSR2_IRQ_EI |
| 1864 | select MIPS_MT | 1860 | select MIPS_MT |
| 1865 | select NR_CPUS_DEFAULT_2 | ||
| 1866 | select SMP | 1861 | select SMP |
| 1867 | select SYS_SUPPORTS_SCHED_SMT if SMP | 1862 | select SYS_SUPPORTS_SCHED_SMT if SMP |
| 1868 | select SYS_SUPPORTS_SMP | 1863 | select SYS_SUPPORTS_SMP |
| @@ -2173,12 +2168,6 @@ config SYS_SUPPORTS_MIPS_CMP | |||
| 2173 | config SYS_SUPPORTS_SMP | 2168 | config SYS_SUPPORTS_SMP |
| 2174 | bool | 2169 | bool |
| 2175 | 2170 | ||
| 2176 | config NR_CPUS_DEFAULT_1 | ||
| 2177 | bool | ||
| 2178 | |||
| 2179 | config NR_CPUS_DEFAULT_2 | ||
| 2180 | bool | ||
| 2181 | |||
| 2182 | config NR_CPUS_DEFAULT_4 | 2171 | config NR_CPUS_DEFAULT_4 |
| 2183 | bool | 2172 | bool |
| 2184 | 2173 | ||
| @@ -2196,10 +2185,8 @@ config NR_CPUS_DEFAULT_64 | |||
| 2196 | 2185 | ||
| 2197 | config NR_CPUS | 2186 | config NR_CPUS |
| 2198 | int "Maximum number of CPUs (2-64)" | 2187 | int "Maximum number of CPUs (2-64)" |
| 2199 | range 1 64 if NR_CPUS_DEFAULT_1 | 2188 | range 2 64 |
| 2200 | depends on SMP | 2189 | depends on SMP |
| 2201 | default "1" if NR_CPUS_DEFAULT_1 | ||
| 2202 | default "2" if NR_CPUS_DEFAULT_2 | ||
| 2203 | default "4" if NR_CPUS_DEFAULT_4 | 2190 | default "4" if NR_CPUS_DEFAULT_4 |
| 2204 | default "8" if NR_CPUS_DEFAULT_8 | 2191 | default "8" if NR_CPUS_DEFAULT_8 |
| 2205 | default "16" if NR_CPUS_DEFAULT_16 | 2192 | default "16" if NR_CPUS_DEFAULT_16 |
