diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-04 06:51:46 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-29 16:10:51 -0400 |
commit | e73ea273ef87a04ff59fc368fa33333dca275dde (patch) | |
tree | 65c3d7a34a1ecee336c2d194769d7b4614b68593 | |
parent | a620dbe378f3940dc058435d8ce89f5a4a7b77d5 (diff) |
[MIPS] Fix build error: don't offer SMP on systems that don't have SMP.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/Kconfig | 9 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/Kconfig | 3 | ||||
-rw-r--r-- | arch/mips/sibyte/Kconfig | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b8616a0bf93e..002845e820f3 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -536,6 +536,7 @@ config PMC_YOSEMITE | |||
536 | select SYS_SUPPORTS_64BIT_KERNEL | 536 | select SYS_SUPPORTS_64BIT_KERNEL |
537 | select SYS_SUPPORTS_BIG_ENDIAN | 537 | select SYS_SUPPORTS_BIG_ENDIAN |
538 | select SYS_SUPPORTS_HIGHMEM | 538 | select SYS_SUPPORTS_HIGHMEM |
539 | select SYS_SUPPORTS_SMP | ||
539 | help | 540 | help |
540 | Yosemite is an evaluation board for the RM9000x2 processor | 541 | Yosemite is an evaluation board for the RM9000x2 processor |
541 | manufactured by PMC-Sierra. | 542 | manufactured by PMC-Sierra. |
@@ -590,6 +591,7 @@ config SGI_IP22 | |||
590 | select SYS_SUPPORTS_32BIT_KERNEL | 591 | select SYS_SUPPORTS_32BIT_KERNEL |
591 | select SYS_SUPPORTS_64BIT_KERNEL | 592 | select SYS_SUPPORTS_64BIT_KERNEL |
592 | select SYS_SUPPORTS_BIG_ENDIAN | 593 | select SYS_SUPPORTS_BIG_ENDIAN |
594 | select SYS_SUPPORTS_SMP | ||
593 | help | 595 | help |
594 | This are the SGI Indy, Challenge S and Indigo2, as well as certain | 596 | This are the SGI Indy, Challenge S and Indigo2, as well as certain |
595 | OEM variants like the Tandem CMN B006S. To compile a Linux kernel | 597 | OEM variants like the Tandem CMN B006S. To compile a Linux kernel |
@@ -1678,8 +1680,8 @@ source "mm/Kconfig" | |||
1678 | 1680 | ||
1679 | config SMP | 1681 | config SMP |
1680 | bool "Multi-Processing support" | 1682 | bool "Multi-Processing support" |
1681 | depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC | 1683 | depends on SYS_SUPPORTS_SMP |
1682 | ---help--- | 1684 | help |
1683 | This enables support for systems with more than one CPU. If you have | 1685 | This enables support for systems with more than one CPU. If you have |
1684 | a system with only one CPU, like most personal computers, say N. If | 1686 | a system with only one CPU, like most personal computers, say N. If |
1685 | you have a system with more than one CPU, say Y. | 1687 | you have a system with more than one CPU, say Y. |
@@ -1698,6 +1700,9 @@ config SMP | |||
1698 | 1700 | ||
1699 | If you don't know what to do here, say N. | 1701 | If you don't know what to do here, say N. |
1700 | 1702 | ||
1703 | config SYS_SUPPORTS_SMP | ||
1704 | bool | ||
1705 | |||
1701 | config NR_CPUS | 1706 | config NR_CPUS |
1702 | int "Maximum number of CPUs (2-64)" | 1707 | int "Maximum number of CPUs (2-64)" |
1703 | range 2 64 | 1708 | range 2 64 |
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig index f14ef38646d0..5e960ae9735a 100644 --- a/arch/mips/sgi-ip27/Kconfig +++ b/arch/mips/sgi-ip27/Kconfig | |||
@@ -33,12 +33,13 @@ config MAPPED_KERNEL | |||
33 | depends on SGI_IP27 | 33 | depends on SGI_IP27 |
34 | help | 34 | help |
35 | Change the way a Linux kernel is loaded into memory on a MIPS64 | 35 | Change the way a Linux kernel is loaded into memory on a MIPS64 |
36 | machine. This is required in order to support text replication and | 36 | machine. This is required in order to support text replication on |
37 | NUMA. If you need to understand it, read the source code. | 37 | NUMA. If you need to understand it, read the source code. |
38 | 38 | ||
39 | config REPLICATE_KTEXT | 39 | config REPLICATE_KTEXT |
40 | bool "Kernel text replication support" | 40 | bool "Kernel text replication support" |
41 | depends on SGI_IP27 | 41 | depends on SGI_IP27 |
42 | select MAPPED_KERNEL | ||
42 | help | 43 | help |
43 | Say Y here to enable replicating the kernel text across multiple | 44 | Say Y here to enable replicating the kernel text across multiple |
44 | nodes in a NUMA cluster. This trades memory for speed. | 45 | nodes in a NUMA cluster. This trades memory for speed. |
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig index 816aee7fcd25..ec7a2cffacf0 100644 --- a/arch/mips/sibyte/Kconfig +++ b/arch/mips/sibyte/Kconfig | |||
@@ -3,6 +3,7 @@ config SIBYTE_SB1250 | |||
3 | select HW_HAS_PCI | 3 | select HW_HAS_PCI |
4 | select SIBYTE_HAS_LDT | 4 | select SIBYTE_HAS_LDT |
5 | select SIBYTE_SB1xxx_SOC | 5 | select SIBYTE_SB1xxx_SOC |
6 | select SYS_SUPPORTS_SMP | ||
6 | 7 | ||
7 | config SIBYTE_BCM1120 | 8 | config SIBYTE_BCM1120 |
8 | bool | 9 | bool |
@@ -30,11 +31,13 @@ config SIBYTE_BCM1x80 | |||
30 | bool | 31 | bool |
31 | select HW_HAS_PCI | 32 | select HW_HAS_PCI |
32 | select SIBYTE_SB1xxx_SOC | 33 | select SIBYTE_SB1xxx_SOC |
34 | select SYS_SUPPORTS_SMP | ||
33 | 35 | ||
34 | config SIBYTE_BCM1x55 | 36 | config SIBYTE_BCM1x55 |
35 | bool | 37 | bool |
36 | select HW_HAS_PCI | 38 | select HW_HAS_PCI |
37 | select SIBYTE_SB1xxx_SOC | 39 | select SIBYTE_SB1xxx_SOC |
40 | select SYS_SUPPORTS_SMP | ||
38 | 41 | ||
39 | config SIBYTE_SB1xxx_SOC | 42 | config SIBYTE_SB1xxx_SOC |
40 | bool | 43 | bool |