aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2008-10-03 19:06:29 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-10-05 20:22:28 -0400
commit4a16ff4c692d49f0caeabe08e6d3ae28a0ad4d04 (patch)
treeb02016735f6f984affb0ee35950f328da9ae5483 /arch
parentfec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff)
[MIPS] Fix CMP Kconfig configuration and mark as broken.
Because sync-r4k.c doesn't build. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kconfig27
1 files changed, 16 insertions, 11 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c930b8ceb418..1e06d233fa83 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -211,6 +211,7 @@ config MIPS_MALTA
211 select SYS_SUPPORTS_64BIT_KERNEL 211 select SYS_SUPPORTS_64BIT_KERNEL
212 select SYS_SUPPORTS_BIG_ENDIAN 212 select SYS_SUPPORTS_BIG_ENDIAN
213 select SYS_SUPPORTS_LITTLE_ENDIAN 213 select SYS_SUPPORTS_LITTLE_ENDIAN
214 select SYS_SUPPORTS_MIPS_CMP if BROKEN # because SYNC_R4K is broken
214 select SYS_SUPPORTS_MULTITHREADING 215 select SYS_SUPPORTS_MULTITHREADING
215 select SYS_SUPPORTS_SMARTMIPS 216 select SYS_SUPPORTS_SMARTMIPS
216 help 217 help
@@ -1499,6 +1500,18 @@ config MIPS_APSP_KSPD
1499 "exit" syscall notifying other kernel modules the SP program is 1500 "exit" syscall notifying other kernel modules the SP program is
1500 exiting. You probably want to say yes here. 1501 exiting. You probably want to say yes here.
1501 1502
1503config MIPS_CMP
1504 bool "MIPS CMP framework support"
1505 depends on SYS_SUPPORTS_MIPS_CMP
1506 select SYNC_R4K if BROKEN
1507 select SYS_SUPPORTS_SMP
1508 select SYS_SUPPORTS_SCHED_SMT if SMP
1509 select WEAK_ORDERING
1510 default n
1511 help
1512 This is a placeholder option for the GCMP work. It will need to
1513 be handled differently...
1514
1502config SB1_PASS_1_WORKAROUNDS 1515config SB1_PASS_1_WORKAROUNDS
1503 bool 1516 bool
1504 depends on CPU_SB1_PASS_1 1517 depends on CPU_SB1_PASS_1
@@ -1675,6 +1688,9 @@ config SMP
1675config SMP_UP 1688config SMP_UP
1676 bool 1689 bool
1677 1690
1691config SYS_SUPPORTS_MIPS_CMP
1692 bool
1693
1678config SYS_SUPPORTS_SMP 1694config SYS_SUPPORTS_SMP
1679 bool 1695 bool
1680 1696
@@ -1722,17 +1738,6 @@ config NR_CPUS
1722 performance should round up your number of processors to the next 1738 performance should round up your number of processors to the next
1723 power of two. 1739 power of two.
1724 1740
1725config MIPS_CMP
1726 bool "MIPS CMP framework support"
1727 depends on SMP
1728 select SYNC_R4K
1729 select SYS_SUPPORTS_SCHED_SMT
1730 select WEAK_ORDERING
1731 default n
1732 help
1733 This is a placeholder option for the GCMP work. It will need to
1734 be handled differently...
1735
1736source "kernel/time/Kconfig" 1741source "kernel/time/Kconfig"
1737 1742
1738# 1743#