Przeglądaj źródła

[MIPS] Fix build error: don't offer SMP on systems that don't have SMP.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle 19 lat temu
rodzic
commit
e73ea273ef
3 zmienionych plików z 12 dodań i 3 usunięć
  1. 7 2
      arch/mips/Kconfig
  2. 2 1
      arch/mips/sgi-ip27/Kconfig
  3. 3 0
      arch/mips/sibyte/Kconfig

+ 7 - 2
arch/mips/Kconfig

@@ -536,6 +536,7 @@ config PMC_YOSEMITE
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_HIGHMEM
 	select SYS_SUPPORTS_HIGHMEM
+	select SYS_SUPPORTS_SMP
 	help
 	help
 	  Yosemite is an evaluation board for the RM9000x2 processor
 	  Yosemite is an evaluation board for the RM9000x2 processor
 	  manufactured by PMC-Sierra.
 	  manufactured by PMC-Sierra.
@@ -590,6 +591,7 @@ config SGI_IP22
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_SMP
 	help
 	help
 	  This are the SGI Indy, Challenge S and Indigo2, as well as certain
 	  This are the SGI Indy, Challenge S and Indigo2, as well as certain
 	  OEM variants like the Tandem CMN B006S. To compile a Linux kernel
 	  OEM variants like the Tandem CMN B006S. To compile a Linux kernel
@@ -1678,8 +1680,8 @@ source "mm/Kconfig"
 
 
 config SMP
 config SMP
 	bool "Multi-Processing support"
 	bool "Multi-Processing support"
-	depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC
-	---help---
+	depends on SYS_SUPPORTS_SMP
+	help
 	  This enables support for systems with more than one CPU. If you have
 	  This enables support for systems with more than one CPU. If you have
 	  a system with only one CPU, like most personal computers, say N. If
 	  a system with only one CPU, like most personal computers, say N. If
 	  you have a system with more than one CPU, say Y.
 	  you have a system with more than one CPU, say Y.
@@ -1698,6 +1700,9 @@ config SMP
 
 
 	  If you don't know what to do here, say N.
 	  If you don't know what to do here, say N.
 
 
+config SYS_SUPPORTS_SMP
+	bool
+
 config NR_CPUS
 config NR_CPUS
 	int "Maximum number of CPUs (2-64)"
 	int "Maximum number of CPUs (2-64)"
 	range 2 64
 	range 2 64

+ 2 - 1
arch/mips/sgi-ip27/Kconfig

@@ -33,12 +33,13 @@ config MAPPED_KERNEL
 	depends on SGI_IP27
 	depends on SGI_IP27
 	help
 	help
 	  Change the way a Linux kernel is loaded into memory on a MIPS64
 	  Change the way a Linux kernel is loaded into memory on a MIPS64
-	  machine.  This is required in order to support text replication and
+	  machine.  This is required in order to support text replication on
 	  NUMA.  If you need to understand it, read the source code.
 	  NUMA.  If you need to understand it, read the source code.
 
 
 config REPLICATE_KTEXT
 config REPLICATE_KTEXT
 	bool "Kernel text replication support"
 	bool "Kernel text replication support"
 	depends on SGI_IP27
 	depends on SGI_IP27
+	select MAPPED_KERNEL
 	help
 	help
 	  Say Y here to enable replicating the kernel text across multiple
 	  Say Y here to enable replicating the kernel text across multiple
 	  nodes in a NUMA cluster.  This trades memory for speed.
 	  nodes in a NUMA cluster.  This trades memory for speed.

+ 3 - 0
arch/mips/sibyte/Kconfig

@@ -3,6 +3,7 @@ config SIBYTE_SB1250
 	select HW_HAS_PCI
 	select HW_HAS_PCI
 	select SIBYTE_HAS_LDT
 	select SIBYTE_HAS_LDT
 	select SIBYTE_SB1xxx_SOC
 	select SIBYTE_SB1xxx_SOC
+	select SYS_SUPPORTS_SMP
 
 
 config SIBYTE_BCM1120
 config SIBYTE_BCM1120
 	bool
 	bool
@@ -30,11 +31,13 @@ config SIBYTE_BCM1x80
 	bool
 	bool
 	select HW_HAS_PCI
 	select HW_HAS_PCI
 	select SIBYTE_SB1xxx_SOC
 	select SIBYTE_SB1xxx_SOC
+	select SYS_SUPPORTS_SMP
 
 
 config SIBYTE_BCM1x55
 config SIBYTE_BCM1x55
 	bool
 	bool
 	select HW_HAS_PCI
 	select HW_HAS_PCI
 	select SIBYTE_SB1xxx_SOC
 	select SIBYTE_SB1xxx_SOC
+	select SYS_SUPPORTS_SMP
 
 
 config SIBYTE_SB1xxx_SOC
 config SIBYTE_SB1xxx_SOC
 	bool
 	bool