1 files changed, 94 insertions, 77 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7aec60d40420..e8ff09fe73d9 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -13,7 +13,7 @@ choice
         default SGI_IP22
 
 config MIPS_MTX1
-        bool "Support for 4G Systems MTX-1 board"
+        bool "4G Systems MTX-1 board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SOC_AU1500
@@ -120,7 +120,7 @@ config MIPS_MIRAGE
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MIPS_COBALT
-        bool "Support for Cobalt Server"
+        bool "Cobalt Server"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select I8259
@@ -132,7 +132,7 @@ config MIPS_COBALT
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MACH_DECSTATION
-        bool "Support for DECstations"
+        bool "DECstations"
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select EARLY_PRINTK
@@ -158,7 +158,7 @@ config MACH_DECSTATION
           otherwise choose R3000.
 
 config MIPS_EV64120
-        bool "Support for Galileo EV64120 Evaluation board (EXPERIMENTAL)"
+        bool "Galileo EV64120 Evaluation board (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select DMA_NONCOHERENT
         select HW_HAS_PCI
@@ -175,7 +175,7 @@ config MIPS_EV64120
           kernel for this platform.
 
 config MIPS_EV96100
-        bool "Support for Galileo EV96100 Evaluation board (EXPERIMENTAL)"
+        bool "Galileo EV96100 Evaluation board (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select DMA_NONCOHERENT
         select HW_HAS_PCI
@@ -195,7 +195,7 @@ config MIPS_EV96100
           here if you wish to build a kernel for this platform.
 
 config MIPS_IVR
-        bool "Support for Globespan IVR board"
+        bool "Globespan IVR board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select ITE_BOARD_GEN
@@ -211,7 +211,7 @@ config MIPS_IVR
           build a kernel for this platform.
 
 config MIPS_ITE8172
-        bool "Support for ITE 8172G board"
+        bool "ITE 8172G board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select ITE_BOARD_GEN
@@ -228,7 +228,7 @@ config MIPS_ITE8172
           a kernel for this platform.
 
 config MACH_JAZZ
-        bool "Support for the Jazz family of machines"
+        bool "Jazz family of machines"
         select ARC
         select ARC32
         select ARCH_MAY_HAVE_PC_FDC
@@ -246,7 +246,7 @@ config MACH_JAZZ
          Olivetti M700-10 workstations.
 
 config LASAT
-        bool "Support for LASAT Networks platforms"
+        bool "LASAT Networks platforms"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_GT64120
@@ -258,7 +258,7 @@ config LASAT
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MIPS_ATLAS
-        bool "Support for MIPS Atlas board"
+        bool "MIPS Atlas board"
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select IRQ_CPU
@@ -283,7 +283,7 @@ config MIPS_ATLAS
           board.
 
 config MIPS_MALTA
-        bool "Support for MIPS Malta board"
+        bool "MIPS Malta board"
         select ARCH_MAY_HAVE_PC_FDC
         select BOOT_ELF32
         select HAVE_STD_PC_SERIAL_PORT
@@ -311,7 +311,7 @@ config MIPS_MALTA
           board.
 
 config MIPS_SEAD
-        bool "Support for MIPS SEAD board (EXPERIMENTAL)"
+        bool "MIPS SEAD board (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select IRQ_CPU
         select DMA_NONCOHERENT
@@ -328,7 +328,7 @@ config MIPS_SEAD
           board.
 
 config MIPS_SIM
-        bool 'Support for MIPS simulator (MIPSsim)'
+        bool 'MIPS simulator (MIPSsim)'
         select DMA_NONCOHERENT
         select IRQ_CPU
         select SYS_HAS_CPU_MIPS32_R1
@@ -341,7 +341,7 @@ config MIPS_SIM
           emulator.
 
 config MOMENCO_JAGUAR_ATX
-        bool "Support for Momentum Jaguar board"
+        bool "Momentum Jaguar board"
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select HW_HAS_PCI
@@ -361,7 +361,7 @@ config MOMENCO_JAGUAR_ATX
           Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT
-        bool "Support for Momentum Ocelot board"
+        bool "Momentum Ocelot board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select IRQ_CPU
@@ -378,7 +378,7 @@ config MOMENCO_OCELOT
           Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT_3
-        bool "Support for Momentum Ocelot-3 board"
+        bool "Momentum Ocelot-3 board"
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select HW_HAS_PCI
@@ -397,7 +397,7 @@ config MOMENCO_OCELOT_3
           PMC-Sierra Rm79000 core.
 
 config MOMENCO_OCELOT_C
-        bool "Support for Momentum Ocelot-C board"
+        bool "Momentum Ocelot-C board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select IRQ_CPU
@@ -414,7 +414,7 @@ config MOMENCO_OCELOT_C
           Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT_G
-        bool "Support for Momentum Ocelot-G board"
+        bool "Momentum Ocelot-G board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select IRQ_CPU
@@ -431,23 +431,23 @@ config MOMENCO_OCELOT_G
           Momentum Computer <http://www.momenco.com/>.
 
 config MIPS_XXS1500
-        bool "Support for MyCable XXS1500 board"
+        bool "MyCable XXS1500 board"
         select DMA_NONCOHERENT
         select SOC_AU1500
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_V2PCI
-        bool "Support for Philips PNX8550 based Viper2-PCI board"
+        bool "Philips PNX8550 based Viper2-PCI board"
         select PNX8550
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_JBS
-        bool "Support for Philips PNX8550 based JBS board"
+        bool "Philips PNX8550 based JBS board"
         select PNX8550
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config DDB5074
-        bool "Support for NEC DDB Vrc-5074 (EXPERIMENTAL)"
+        bool "NEC DDB Vrc-5074 (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select DDB5XXX_COMMON
         select DMA_NONCOHERENT
@@ -465,7 +465,7 @@ config DDB5074
           evaluation board.
 
 config DDB5476
-        bool "Support for NEC DDB Vrc-5476"
+        bool "NEC DDB Vrc-5476"
         select DDB5XXX_COMMON
         select DMA_NONCOHERENT
         select HAVE_STD_PC_SERIAL_PORT
@@ -486,7 +486,7 @@ config DDB5476
           IDE controller, PS2 keyboard, PS2 mouse, etc.
 
 config DDB5477
-        bool "Support for NEC DDB Vrc-5477"
+        bool "NEC DDB Vrc-5477"
         select DDB5XXX_COMMON
         select DMA_NONCOHERENT
         select HW_HAS_PCI
@@ -504,13 +504,13 @@ config DDB5477
           ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
-        bool "Support for NEC VR4100 series based machines"
+        bool "NEC VR41XX-based machines"
         select SYS_HAS_CPU_VR41XX
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 config PMC_YOSEMITE
-        bool "Support for PMC-Sierra Yosemite eval board"
+        bool "PMC-Sierra Yosemite eval board"
         select DMA_COHERENT
         select HW_HAS_PCI
         select IRQ_CPU
@@ -527,7 +527,7 @@ config PMC_YOSEMITE
           manufactured by PMC-Sierra.
 
 config QEMU
-        bool "Support for Qemu"
+        bool "Qemu"
         select DMA_COHERENT
         select GENERIC_ISA_DMA
         select HAVE_STD_PC_SERIAL_PORT
@@ -547,7 +547,7 @@ config QEMU
           can be found at http://www.linux-mips.org/wiki/Qemu.
 
 config SGI_IP22
-        bool "Support for SGI IP22 (Indy/Indigo2)"
+        bool "SGI IP22 (Indy/Indigo2)"
         select ARC
         select ARC32
         select BOOT_ELF32
@@ -567,7 +567,7 @@ config SGI_IP22
           that runs on these, say Y here.
 
 config SGI_IP27
-        bool "Support for SGI IP27 (Origin200/2000)"
+        bool "SGI IP27 (Origin200/2000)"
         select ARC
         select ARC64
         select BOOT_ELF64
@@ -583,7 +583,7 @@ config SGI_IP27
           here.
 
 config SGI_IP32
-        bool "Support for SGI IP32 (O2) (EXPERIMENTAL)"
+        bool "SGI IP32 (O2) (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select ARC
         select ARC32
@@ -604,7 +604,7 @@ config SGI_IP32
           If you want this kernel to run on SGI O2 workstation, say Y here.
 
 config SIBYTE_BIGSUR
-        bool "Support for Sibyte BCM91480B-BigSur"
+        bool "Sibyte BCM91480B-BigSur"
         select BOOT_ELF32
         select DMA_COHERENT
         select PCI_DOMAINS
@@ -615,7 +615,7 @@ config SIBYTE_BIGSUR
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SWARM
-        bool "Support for Sibyte BCM91250A-SWARM"
+        bool "Sibyte BCM91250A-SWARM"
         select BOOT_ELF32
         select DMA_COHERENT
         select SIBYTE_SB1250
@@ -626,7 +626,7 @@ config SIBYTE_SWARM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SENTOSA
-        bool "Support for Sibyte BCM91250E-Sentosa"
+        bool "Sibyte BCM91250E-Sentosa"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -637,7 +637,7 @@ config SIBYTE_SENTOSA
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_RHONE
-        bool "Support for Sibyte BCM91125E-Rhone"
+        bool "Sibyte BCM91125E-Rhone"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -648,7 +648,7 @@ config SIBYTE_RHONE
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CARMEL
-        bool "Support for Sibyte BCM91120x-Carmel"
+        bool "Sibyte BCM91120x-Carmel"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -659,7 +659,7 @@ config SIBYTE_CARMEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_PTSWARM
-        bool "Support for Sibyte BCM91250PT-PTSWARM"
+        bool "Sibyte BCM91250PT-PTSWARM"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -671,7 +671,7 @@ config SIBYTE_PTSWARM
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_LITTLESUR
-        bool "Support for Sibyte BCM91250C2-LittleSur"
+        bool "Sibyte BCM91250C2-LittleSur"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -683,7 +683,7 @@ config SIBYTE_LITTLESUR
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CRHINE
-        bool "Support for Sibyte BCM91120C-CRhine"
+        bool "Sibyte BCM91120C-CRhine"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -694,7 +694,7 @@ config SIBYTE_CRHINE
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CRHONE
-        bool "Support for Sibyte BCM91125C-CRhone"
+        bool "Sibyte BCM91125C-CRhone"
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
@@ -706,7 +706,7 @@ config SIBYTE_CRHONE
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM200_PCI
-        bool "Support for SNI RM200 PCI"
+        bool "SNI RM200 PCI"
         select ARC
         select ARC32
         select ARCH_MAY_HAVE_PC_FDC
@@ -732,7 +732,7 @@ config SNI_RM200_PCI
           support this machine type.
 
 config TOSHIBA_JMR3927
-        bool "Support for Toshiba JMR-TX3927 board"
+        bool "Toshiba JMR-TX3927 board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_TX3927
@@ -743,7 +743,7 @@ config TOSHIBA_JMR3927
         select TOSHIBA_BOARDS
 
 config TOSHIBA_RBTX4927
-        bool "Support for Toshiba TBTX49[23]7 board"
+        bool "Toshiba TBTX49[23]7 board"
         select DMA_NONCOHERENT
         select HAS_TXX9_SERIAL
         select HW_HAS_PCI
@@ -760,7 +760,7 @@ config TOSHIBA_RBTX4927
           support this machine type
 
 config TOSHIBA_RBTX4938
-        bool "Support for Toshiba RBTX4938 board"
+        bool "Toshiba RBTX4938 board"
         select HAVE_STD_PC_SERIAL_PORT
         select DMA_NONCOHERENT
         select GENERIC_ISA_DMA
@@ -816,6 +816,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+        bool
+        default y
+
 #
 # Select some configuration options automatically based on user selections.
 #
@@ -1063,6 +1067,7 @@ choice
 config CPU_MIPS32_R1
         bool "MIPS32 Release 1"
         depends on SYS_HAS_CPU_MIPS32_R1
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
@@ -1080,6 +1085,7 @@ config CPU_MIPS32_R1
 config CPU_MIPS32_R2
         bool "MIPS32 Release 2"
         depends on SYS_HAS_CPU_MIPS32_R2
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
@@ -1093,6 +1099,7 @@ config CPU_MIPS32_R2
 config CPU_MIPS64_R1
         bool "MIPS64 Release 1"
         depends on SYS_HAS_CPU_MIPS64_R1
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -1111,6 +1118,7 @@ config CPU_MIPS64_R1
 config CPU_MIPS64_R2
         bool "MIPS64 Release 2"
         depends on SYS_HAS_CPU_MIPS64_R2
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -1125,6 +1133,7 @@ config CPU_MIPS64_R2
 config CPU_R3000
         bool "R3000"
         depends on SYS_HAS_CPU_R3000
+        select CPU_HAS_WB
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
         help
@@ -1154,6 +1163,7 @@ config CPU_VR41XX
 config CPU_R4300
         bool "R4300"
         depends on SYS_HAS_CPU_R4300
+        select CPU_HAS_LLSC
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         help
@@ -1162,6 +1172,7 @@ config CPU_R4300
 config CPU_R4X00
         bool "R4x00"
         depends on SYS_HAS_CPU_R4X00
+        select CPU_HAS_LLSC
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         help
@@ -1171,6 +1182,7 @@ config CPU_R4X00
 config CPU_TX49XX
         bool "R49XX"
         depends on SYS_HAS_CPU_TX49XX
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -1178,6 +1190,7 @@ config CPU_TX49XX
 config CPU_R5000
         bool "R5000"
         depends on SYS_HAS_CPU_R5000
+        select CPU_HAS_LLSC
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         help
@@ -1186,12 +1199,14 @@ config CPU_R5000
 config CPU_R5432
         bool "R5432"
         depends on SYS_HAS_CPU_R5432
+        select CPU_HAS_LLSC
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
 
 config CPU_R6000
         bool "R6000"
         depends on EXPERIMENTAL
+        select CPU_HAS_LLSC
         depends on SYS_HAS_CPU_R6000
         select CPU_SUPPORTS_32BIT_KERNEL
         help
@@ -1201,6 +1216,7 @@ config CPU_R6000
 config CPU_NEVADA
         bool "RM52xx"
         depends on SYS_HAS_CPU_NEVADA
+        select CPU_HAS_LLSC
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         help
@@ -1210,6 +1226,7 @@ config CPU_R8000
         bool "R8000"
         depends on EXPERIMENTAL
         depends on SYS_HAS_CPU_R8000
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_64BIT_KERNEL
         help
@@ -1219,6 +1236,7 @@ config CPU_R8000
 config CPU_R10000
         bool "R10000"
         depends on SYS_HAS_CPU_R10000
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -1229,6 +1247,7 @@ config CPU_R10000
 config CPU_RM7000
         bool "RM7000"
         depends on SYS_HAS_CPU_RM7000
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -1237,6 +1256,7 @@ config CPU_RM7000
 config CPU_RM9000
         bool "RM9000"
         depends on SYS_HAS_CPU_RM9000
+        select CPU_HAS_LLSC
         select CPU_HAS_PREFETCH
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -1245,6 +1265,7 @@ config CPU_RM9000
 config CPU_SB1
         bool "SB1"
         depends on SYS_HAS_CPU_SB1
+        select CPU_HAS_LLSC
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
@@ -1390,13 +1411,12 @@ config PAGE_SIZE_8KB
 
 config PAGE_SIZE_16KB
         bool "16kB"
-        depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX
+        depends on !CPU_R3000 && !CPU_TX39XX
         help
           Using 16kB page size will result in higher performance kernel at
           the price of higher memory consumption.  This option is available on
-          all non-R3000 family processor.  Not that at the time of this
-          writing this option is still high experimental; there are also
-          issues with compatibility of user applications.
+          all non-R3000 family processors.  Note that you will need a suitable
+          Linux distribution to support this.
 
 config PAGE_SIZE_64KB
         bool "64kB"
@@ -1405,8 +1425,7 @@ config PAGE_SIZE_64KB
           Using 64kB page size will result in higher performance kernel at
           the price of higher memory consumption.  This option is available on
           all non-R3000 family processor.  Not that at the time of this
-          writing this option is still high experimental; there are also
-          issues with compatibility of user applications.
+          writing this option is still high experimental.
 
 endchoice
 
@@ -1443,6 +1462,12 @@ choice
         prompt "MIPS MT options"
         depends on MIPS_MT
 
+config MIPS_MT_SMTC
+        bool "SMTC: Use all TCs on all VPEs for SMP"
+        select CPU_MIPSR2_IRQ_VI
+        select CPU_MIPSR2_SRS
+        select SMP
+
 config MIPS_MT_SMP
         bool "Use 1 TC on each available VPE for SMP"
         select SMP
@@ -1456,6 +1481,11 @@ config MIPS_VPE_LOADER
 
 endchoice
 
+config MIPS_MT_FPAFF
+        bool "Dynamic FPU affinity for FP-intensive threads"
+        depends on MIPS_MT
+        default y
+
 config MIPS_VPE_LOADER_TOM
         bool "Load VPE program into memory hidden from linux"
         depends on MIPS_VPE_LOADER
@@ -1472,6 +1502,16 @@ config MIPS_VPE_APSP_API
         depends on MIPS_VPE_LOADER
         help
 
+config MIPS_APSP_KSPD
+        bool "Enable KSPD"
+        depends on MIPS_VPE_APSP_API
+        default y
+        help
+          KSPD is a kernel daemon that accepts syscall requests from the SP
+          side, actions them and returns the results. It also handles the
+          "exit" syscall notifying other kernel modules the SP program is
+          exiting.  You probably want to say yes here.
+
 config SB1_PASS_1_WORKAROUNDS
         bool
         depends on CPU_SB1_PASS_1
@@ -1491,38 +1531,15 @@ config 64BIT_PHYS_ADDR
         bool "Support for 64-bit physical address space"
         depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
 
-config CPU_ADVANCED
-        bool "Override CPU Options"
-        depends on 32BIT
-        help
-          Saying yes here allows you to select support for various features
-          your CPU may or may not have.  Most people should say N here.
-
 config CPU_HAS_LLSC
-        bool "ll/sc Instructions available" if CPU_ADVANCED
-        default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX
-        help
-          MIPS R4000 series and later provide the Load Linked (ll)
-          and Store Conditional (sc) instructions. More information is
-          available at <http://www.go-ecs.com/mips/miptek1.htm>.
-
-          Say Y here if your CPU has the ll and sc instructions.  Say Y here
-          for better performance, N if you don't know.  You must say Y here
-          for multiprocessor machines.
+        bool
 
 config CPU_HAS_WB
-        bool "Writeback Buffer available" if CPU_ADVANCED
-        default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION
-        help
-          Say N here for slightly better performance.  You must say Y here for
-          machines which require flushing of write buffers in software.  Saying
-          Y is the safe option; N may result in kernel malfunction and crashes.
-
-menu "MIPSR2 Interrupt handling"
-        depends on CPU_MIPSR2 && CPU_ADVANCED
+        bool
 
 config CPU_MIPSR2_IRQ_VI
         bool "Vectored interrupt mode"
+        depends on CPU_MIPSR2
         help
            Vectored interrupt mode allowing faster dispatching of interrupts.
            The board support code needs to be written to take advantage of this
@@ -1532,6 +1549,7 @@ config CPU_MIPSR2_IRQ_VI
 
 config CPU_MIPSR2_IRQ_EI
         bool "External interrupt controller mode"
+        depends on CPU_MIPSR2
         help
            Extended interrupt mode takes advantage of an external interrupt
            controller to allow fast dispatching from many possible interrupt
@@ -1545,7 +1563,6 @@ config CPU_MIPSR2_SRS
            Allow the kernel to use shadow register sets for fast interrupts.
            Interrupt handlers must be specially written to use shadow sets.
            Say N unless you know that shadow register set upport is needed.
-endmenu
 
 config CPU_HAS_SYNC
         bool
@@ -1599,7 +1616,7 @@ source "mm/Kconfig"
 
 config SMP
         bool "Multi-Processing support"
-        depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP
+        depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC
         ---help---
           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