Merge branch 'generic-ipi' into generic-ipi-for-linus

[safe/jmp/linux-2.6] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4c6ba7b..d2be3ff 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,6 +1,8 @@
 config MIPS
        bool
        default y
 config MIPS
        bool
        default y

+       select HAVE_IDE
+       select HAVE_OPROFILE

        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
        select RTC_LIB
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
        select RTC_LIB


@@ -37,16 +39,6 @@ config BASLER_EXCITE
          The eXcite is a smart camera platform manufactured by
          Basler Vision Technologies AG.
 
          The eXcite is a smart camera platform manufactured by
          Basler Vision Technologies AG.
 

-config BASLER_EXCITE_PROTOTYPE
-       bool "Support for pre-release units"
-       depends on BASLER_EXCITE
-       default n
-       help
-         Pre-series (prototype) units are different from later ones in
-         some ways. Select this option if you have one of these. Please
-         note that a kernel built with this option selected will not be
-         able to run on normal units.
-

 config BCM47XX
        bool "BCM47XX based boards"
        select CEVT_R4K
 config BCM47XX
        bool "BCM47XX based boards"
        select CEVT_R4K


@@ -59,6 +51,8 @@ config BCM47XX
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SSB
        select SSB_DRIVER_MIPS
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SSB
        select SSB_DRIVER_MIPS

+       select SSB_DRIVER_EXTIF
+       select SSB_PCICORE_HOSTMODE if PCI

        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK
        select CFE
        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK
        select CFE


@@ -80,15 +74,20 @@ config MIPS_COBALT
        select SYS_HAS_CPU_NEVADA
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_HAS_CPU_NEVADA
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL

-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_64BIT_KERNEL

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32

+       select CEVT_DS1287

        select CEVT_R4K
        select CEVT_R4K

+       select CSRC_IOASIC

        select CSRC_R4K
        select CSRC_R4K

+       select CPU_DADDI_WORKAROUNDS if 64BIT
+       select CPU_R4000_WORKAROUNDS if 64BIT
+       select CPU_R4400_WORKAROUNDS if 64BIT

        select DMA_NONCOHERENT
        select NO_IOPORT
        select IRQ_CPU
        select DMA_NONCOHERENT
        select NO_IOPORT
        select IRQ_CPU


@@ -122,12 +121,12 @@ config MACH_JAZZ
        select ARCH_MAY_HAVE_PC_FDC
        select CEVT_R4K
        select CSRC_R4K
        select ARCH_MAY_HAVE_PC_FDC
        select CEVT_R4K
        select CSRC_R4K

+       select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN

        select GENERIC_ISA_DMA
        select IRQ_CPU
        select I8253
        select I8259
        select ISA
        select GENERIC_ISA_DMA
        select IRQ_CPU
        select I8253
        select I8259
        select ISA

-       select PCSPEAKER

        select SYS_HAS_CPU_R4X00
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_HAS_CPU_R4X00
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL


@@ -185,6 +184,7 @@ config LEMOTE_FULONG
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32

+       select BOOT_RAW

        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT


@@ -217,11 +217,13 @@ config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32

+       select BOOT_RAW

        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select IRQ_CPU
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select IRQ_CPU

+       select IRQ_GIC

        select HW_HAS_PCI
        select I8253
        select I8259
        select HW_HAS_PCI
        select I8253
        select I8259


@@ -310,12 +312,12 @@ config MACH_VR41XX
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config PNX8550_JBS
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config PNX8550_JBS

-       bool "Philips PNX8550 based JBS board"
+       bool "NXP PNX8550 based JBS board"

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_STB810
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_STB810

-       bool "Philips PNX8550 based STB810 board"
+       bool "NXP PNX8550 based STB810 board"

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -362,35 +364,6 @@ config PMC_YOSEMITE
          Yosemite is an evaluation board for the RM9000x2 processor
          manufactured by PMC-Sierra.
 
          Yosemite is an evaluation board for the RM9000x2 processor
          manufactured by PMC-Sierra.
 

-config QEMU
-       bool "Qemu"
-       select CEVT_R4K
-       select CSRC_R4K
-       select DMA_COHERENT
-       select GENERIC_ISA_DMA
-       select HAVE_STD_PC_SERIAL_PORT
-       select I8253
-       select I8259
-       select IRQ_CPU
-       select ISA
-       select PCSPEAKER
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_EARLY_PRINTK
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select GENERIC_HARDIRQS_NO__DO_IRQ
-       select NR_CPUS_DEFAULT_1
-       select SYS_SUPPORTS_SMP
-       help
-         Qemu is a software emulator which among other architectures also
-         can simulate a MIPS32 4Kc system.  This patch adds support for the
-         system architecture that currently is being simulated by Qemu.  It
-         will eventually be removed again when Qemu has the capability to
-         simulate actual MIPS hardware platforms.  More information on Qemu
-         can be found at http://www.linux-mips.org/wiki/Qemu.
-

 config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
        select ARC
 config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
        select ARC


@@ -398,12 +371,20 @@ config SGI_IP22
        select BOOT_ELF32
        select CEVT_R4K
        select CSRC_R4K
        select BOOT_ELF32
        select CEVT_R4K
        select CSRC_R4K

+       select DEFAULT_SGI_PARTITION

        select DMA_NONCOHERENT
        select HW_HAS_EISA
        select I8253
        select DMA_NONCOHERENT
        select HW_HAS_EISA
        select I8253

+       select I8259

        select IP22_CPU_SCACHE
        select IRQ_CPU
        select GENERIC_ISA_DMA_SUPPORT_BROKEN
        select IP22_CPU_SCACHE
        select IRQ_CPU
        select GENERIC_ISA_DMA_SUPPORT_BROKEN

+       select SGI_HAS_DS1286
+       select SGI_HAS_I8042
+       select SGI_HAS_INDYDOG
+       select SGI_HAS_SEEQ
+       select SGI_HAS_WD93
+       select SGI_HAS_ZILOG

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000


@@ -421,6 +402,7 @@ config SGI_IP27
        select ARC
        select ARC64
        select BOOT_ELF64
        select ARC
        select ARC64
        select BOOT_ELF64

+       select DEFAULT_SGI_PARTITION

        select DMA_IP27
        select SYS_HAS_EARLY_PRINTK
        select HW_HAS_PCI
        select DMA_IP27
        select SYS_HAS_EARLY_PRINTK
        select HW_HAS_PCI


@@ -437,6 +419,36 @@ config SGI_IP27
          workstations.  To compile a Linux kernel that runs on these, say Y
          here.
 
          workstations.  To compile a Linux kernel that runs on these, say Y
          here.
 

+config SGI_IP28
+       bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select ARC
+       select ARC64
+       select BOOT_ELF64
+       select CEVT_R4K
+       select CSRC_R4K
+       select DEFAULT_SGI_PARTITION
+       select DMA_NONCOHERENT
+       select GENERIC_ISA_DMA_SUPPORT_BROKEN
+       select IRQ_CPU
+       select HW_HAS_EISA
+       select I8253
+       select I8259
+       select SGI_HAS_DS1286
+       select SGI_HAS_I8042
+       select SGI_HAS_INDYDOG
+       select SGI_HAS_SEEQ
+       select SGI_HAS_WD93
+       select SGI_HAS_ZILOG
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_R10000
+       select SYS_HAS_EARLY_PRINTK
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+      help
+        This is the SGI Indigo2 with R10000 processor.  To compile a Linux
+        kernel that runs on these, say Y here.
+

 config SGI_IP32
        bool "SGI IP32 (O2)"
        select ARC
 config SGI_IP32
        bool "SGI IP32 (O2)"
        select ARC


@@ -542,19 +554,6 @@ config SIBYTE_SENTOSA
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_PTSWARM
-       bool "Sibyte BCM91250PT-PTSWARM"
-       depends on EXPERIMENTAL
-       select BOOT_ELF32
-       select DMA_COHERENT
-       select NR_CPUS_DEFAULT_2
-       select SIBYTE_SB1250
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_SB1
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_HIGHMEM
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-

 config SIBYTE_BIGSUR
        bool "Sibyte BCM91480B-BigSur"
        select BOOT_ELF32
 config SIBYTE_BIGSUR
        bool "Sibyte BCM91480B-BigSur"
        select BOOT_ELF32


@@ -572,10 +571,12 @@ config SNI_RM
        bool "SNI RM200/300/400"
        select ARC if CPU_LITTLE_ENDIAN
        select ARC32 if CPU_LITTLE_ENDIAN
        bool "SNI RM200/300/400"
        select ARC if CPU_LITTLE_ENDIAN
        select ARC32 if CPU_LITTLE_ENDIAN

+       select SNIPROM if CPU_BIG_ENDIAN

        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        select CEVT_R4K
        select CSRC_R4K
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        select CEVT_R4K
        select CSRC_R4K

+       select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN

        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select HW_HAS_EISA
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select HW_HAS_EISA


@@ -584,7 +585,6 @@ config SNI_RM
        select I8253
        select I8259
        select ISA
        select I8253
        select I8259
        select ISA

-       select PCSPEAKER

        select SWAP_IO_SPACE if CPU_BIG_ENDIAN
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000
        select SWAP_IO_SPACE if CPU_BIG_ENDIAN
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000


@@ -615,6 +615,7 @@ config TOSHIBA_JMR3927
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ

+       select GPIO_TXX9

 
 config TOSHIBA_RBTX4927
        bool "Toshiba RBTX49[23]7 board"
 
 config TOSHIBA_RBTX4927
        bool "Toshiba RBTX49[23]7 board"


@@ -656,7 +657,7 @@ config TOSHIBA_RBTX4938
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        select GENERIC_HARDIRQS_NO__DO_IRQ
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        select GENERIC_HARDIRQS_NO__DO_IRQ

-       select GENERIC_GPIO
+       select GPIO_TXX9

        help
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type
        help
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type


@@ -687,6 +688,7 @@ config WR_PPMC
 endchoice
 
 source "arch/mips/au1000/Kconfig"
 endchoice
 
 source "arch/mips/au1000/Kconfig"

+source "arch/mips/basler/excite/Kconfig"

 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"


@@ -698,6 +700,11 @@ source "arch/mips/vr41xx/Kconfig"
 
 endmenu
 
 
 endmenu
 

+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+

 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y


@@ -713,6 +720,10 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
 
        bool
        default n
 

+config ARCH_SUPPORTS_OPROFILE
+       bool
+       default y if !MIPS_MT_SMTC
+

 config GENERIC_FIND_NEXT_BIT
        bool
        default y
 config GENERIC_FIND_NEXT_BIT
        bool
        default y


@@ -760,6 +771,9 @@ config BOOT_RAW
 config CEVT_BCM1480
        bool
 
 config CEVT_BCM1480
        bool
 

+config CEVT_DS1287
+       bool
+

 config CEVT_GT641XX
        bool
 
 config CEVT_GT641XX
        bool
 


@@ -775,12 +789,20 @@ config CEVT_TXX9
 config CSRC_BCM1480
        bool
 
 config CSRC_BCM1480
        bool
 

+config CSRC_IOASIC
+       bool
+

 config CSRC_R4K
        bool
 
 config CSRC_SB1250
        bool
 
 config CSRC_R4K
        bool
 
 config CSRC_SB1250
        bool
 

+config GPIO_TXX9
+       select GENERIC_GPIO
+       select HAVE_GPIO_LIB
+       bool
+

 config CFE
        bool
 
 config CFE
        bool
 


@@ -790,10 +812,6 @@ config DMA_COHERENT
 config DMA_IP27
        bool
 
 config DMA_IP27
        bool
 

-config DMA_IP32
-       bool
-       select DMA_NEED_PCI_MAP_STATE
-

 config DMA_NONCOHERENT
        bool
        select DMA_NEED_PCI_MAP_STATE
 config DMA_NONCOHERENT
        bool
        select DMA_NEED_PCI_MAP_STATE


@@ -837,6 +855,9 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
        bool
 
 config MIPS_DISABLE_OBSOLETE_IDE
        bool
 

+config SYNC_R4K
+       bool
+

 config NO_IOPORT
        def_bool n
 
 config NO_IOPORT
        def_bool n
 


@@ -906,6 +927,9 @@ config IRQ_TXX9
 config IRQ_GT641XX
        bool
 
 config IRQ_GT641XX
        bool
 

+config IRQ_GIC
+       bool
+

 config MIPS_BOARDS_GEN
        bool
 
 config MIPS_BOARDS_GEN
        bool
 


@@ -949,16 +973,40 @@ config EMMA2RH
 config SERIAL_RM9000
        bool
 
 config SERIAL_RM9000
        bool
 

+config SGI_HAS_DS1286
+       bool
+
+config SGI_HAS_INDYDOG
+       bool
+
+config SGI_HAS_SEEQ
+       bool
+
+config SGI_HAS_WD93
+       bool
+
+config SGI_HAS_ZILOG
+       bool
+
+config SGI_HAS_I8042
+       bool
+
+config DEFAULT_SGI_PARTITION
+       bool
+

 config ARC32
        bool
 
 config ARC32
        bool
 

+config SNIPROM
+       bool
+

 config BOOT_ELF32
        bool
 
 config MIPS_L1_CACHE_SHIFT
        int
        default "4" if MACH_DECSTATION
 config BOOT_ELF32
        bool
 
 config MIPS_L1_CACHE_SHIFT
        int
        default "4" if MACH_DECSTATION

-       default "7" if SGI_IP27 || SNI_RM
+       default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM

        default "4" if PMC_MSP4200_EVAL
        default "5"
 
        default "4" if PMC_MSP4200_EVAL
        default "5"
 


@@ -967,7 +1015,7 @@ config HAVE_STD_PC_SERIAL_PORT
 
 config ARC_CONSOLE
        bool "ARC console support"
 
 config ARC_CONSOLE
        bool "ARC console support"

-       depends on SGI_IP22 || (SNI_RM && CPU_LITTLE_ENDIAN)
+       depends on SGI_IP22 || SGI_IP28 || (SNI_RM && CPU_LITTLE_ENDIAN)

 
 config ARC_MEMORY
        bool
 
 config ARC_MEMORY
        bool


@@ -976,7 +1024,7 @@ config ARC_MEMORY
 
 config ARC_PROMLIB
        bool
 
 config ARC_PROMLIB
        bool

-       depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP32
+       depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP28 || SGI_IP32

        default y
 
 config ARC64
        default y
 
 config ARC64


@@ -987,8 +1035,6 @@ config BOOT_ELF64
 
 menu "CPU selection"
 
 
 menu "CPU selection"
 

-source "kernel/time/Kconfig"
-

 choice
        prompt "CPU type"
        default CPU_R4X00
 choice
        prompt "CPU type"
        default CPU_R4X00


@@ -1438,7 +1484,9 @@ config MIPS_MT_SMP
        select MIPS_MT
        select NR_CPUS_DEFAULT_2
        select SMP
        select MIPS_MT
        select NR_CPUS_DEFAULT_2
        select SMP

+       select SYS_SUPPORTS_SCHED_SMT if SMP

        select SYS_SUPPORTS_SMP
        select SYS_SUPPORTS_SMP

+       select SMP_UP

        help
          This is a kernel model which is also known a VSMP or lately
          has been marketesed into SMVP.
        help
          This is a kernel model which is also known a VSMP or lately
          has been marketesed into SMVP.


@@ -1455,6 +1503,7 @@ config MIPS_MT_SMTC
        select NR_CPUS_DEFAULT_8
        select SMP
        select SYS_SUPPORTS_SMP
        select NR_CPUS_DEFAULT_8
        select SMP
        select SYS_SUPPORTS_SMP

+       select SMP_UP

        help
          This is a kernel model which is known a SMTC or lately has been
          marketesed into SMVP.
        help
          This is a kernel model which is known a SMTC or lately has been
          marketesed into SMVP.


@@ -1464,6 +1513,19 @@ endchoice
 config MIPS_MT
        bool
 
 config MIPS_MT
        bool
 

+config SCHED_SMT
+       bool "SMT (multithreading) scheduler support"
+       depends on SYS_SUPPORTS_SCHED_SMT
+       default n
+       help
+         SMT scheduler support improves the CPU scheduler's decision making
+         when dealing with MIPS MT enabled cores at a cost of slightly
+         increased overhead in some places. If unsure say N here.
+
+config SYS_SUPPORTS_SCHED_SMT
+       bool
+
+

 config SYS_SUPPORTS_MULTITHREADING
        bool
 
 config SYS_SUPPORTS_MULTITHREADING
        bool
 


@@ -1584,15 +1646,6 @@ config CPU_HAS_SMARTMIPS
 config CPU_HAS_WB
        bool
 
 config CPU_HAS_WB
        bool
 

-config 64BIT_CONTEXT
-       bool "Save 64bit integer registers"
-       depends on 32BIT && CPU_LOONGSON2
-       help
-         Loongson2 CPU is 64bit , when used in 32BIT mode, its integer
-         registers can still be accessed as 64bit, mainly for multimedia
-         instructions. We must have all 64bit save/restored to make sure
-         those instructions to get correct result.
-

 #
 # Vectored interrupt mode is an R2 feature
 #
 #
 # Vectored interrupt mode is an R2 feature
 #


@@ -1614,6 +1667,19 @@ config GENERIC_CLOCKEVENTS_BROADCAST
        bool
 
 #
        bool
 
 #

+# CPU non-features
+#
+config CPU_DADDI_WORKAROUNDS
+       bool
+
+config CPU_R4000_WORKAROUNDS
+       bool
+       select CPU_R4400_WORKAROUNDS
+
+config CPU_R4400_WORKAROUNDS
+       bool
+
+#

 # Use the generic interrupt handling code in kernel/irq/:
 #
 config GENERIC_HARDIRQS
 # Use the generic interrupt handling code in kernel/irq/:
 #
 config GENERIC_HARDIRQS


@@ -1697,6 +1763,7 @@ config SMP
        bool "Multi-Processing support"
        depends on SYS_SUPPORTS_SMP
        select IRQ_PER_CPU
        bool "Multi-Processing support"
        depends on SYS_SUPPORTS_SMP
        select IRQ_PER_CPU

+       select USE_GENERIC_SMP_HELPERS

        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
        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


@@ -1711,11 +1778,14 @@ config SMP
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below.
 
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below.
 

-         See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-         available at <http://www.tldp.org/docs.html#howto>.
+         See also the SMP-HOWTO available at
+         <http://www.tldp.org/docs.html#howto>.

 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 

+config SMP_UP
+       bool
+

 config SYS_SUPPORTS_SMP
        bool
 
 config SYS_SUPPORTS_SMP
        bool
 


@@ -1763,6 +1833,19 @@ config NR_CPUS
          performance should round up your number of processors to the next
          power of two.
 
          performance should round up your number of processors to the next
          power of two.
 

+config MIPS_CMP
+       bool "MIPS CMP framework support"
+       depends on SMP
+       select SYNC_R4K
+       select SYS_SUPPORTS_SCHED_SMT
+       select WEAK_ORDERING
+       default n
+       help
+         This is a placeholder option for the GCMP work. It will need to
+         be handled differently...
+
+source "kernel/time/Kconfig"
+

 #
 # Timer Interrupt Frequency Configuration
 #
 #
 # Timer Interrupt Frequency Configuration
 #


@@ -1774,7 +1857,7 @@ choice
         Allows the configuration of the timer frequency.
 
        config HZ_48
         Allows the configuration of the timer frequency.
 
        config HZ_48

-               bool "48 HZ" if SYS_SUPPORTS_48HZ
+               bool "48 HZ" if SYS_SUPPORTS_48HZ || SYS_SUPPORTS_ARBIT_HZ

 
        config HZ_100
                bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ
 
        config HZ_100
                bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ


@@ -1913,11 +1996,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config PCI_DOMAINS
        bool
 
 config PCI_DOMAINS
        bool
 


@@ -1971,9 +2049,6 @@ config MMU
 config I8253
        bool
 
 config I8253
        bool
 

-config PCSPEAKER
-       bool
-

 config ZONE_DMA32
        bool
 
 config ZONE_DMA32
        bool
 


@@ -2041,6 +2116,10 @@ endmenu
 
 menu "Power management options"
 
 
 menu "Power management options"
 

+config ARCH_SUSPEND_POSSIBLE
+       def_bool y
+       depends on !SMP
+

 source "kernel/power/Kconfig"
 
 endmenu
 source "kernel/power/Kconfig"
 
 endmenu


@@ -2051,8 +2130,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/mips/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/mips/Kconfig.debug"
 
 source "security/Kconfig"