container freezer: implement freezer cgroup subsystem

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a97bee1..5f149b0 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,6 +1,9 @@
 config MIPS
        bool
        default y
 config MIPS
        bool
        default y

+       select HAVE_IDE
+       select HAVE_OPROFILE
+       select HAVE_ARCH_KGDB

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


@@ -32,7 +35,6 @@ config BASLER_EXCITE
        select SYS_HAS_CPU_RM9000
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_HAS_CPU_RM9000
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

-       select SYS_SUPPORTS_KGDB

        help
          The eXcite is a smart camera platform manufactured by
          Basler Vision Technologies AG.
        help
          The eXcite is a smart camera platform manufactured by
          Basler Vision Technologies AG.


@@ -50,6 +52,7 @@ config BCM47XX
        select SSB
        select SSB_DRIVER_MIPS
        select SSB_DRIVER_EXTIF
        select SSB
        select SSB_DRIVER_MIPS
        select SSB_DRIVER_EXTIF

+       select SSB_EMBEDDED

        select SSB_PCICORE_HOSTMODE if PCI
        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK
        select SSB_PCICORE_HOSTMODE if PCI
        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK


@@ -72,14 +75,16 @@ 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 CPU_DADDI_WORKAROUNDS if 64BIT
        select CPU_R4000_WORKAROUNDS if 64BIT
        select CSRC_R4K
        select CPU_DADDI_WORKAROUNDS if 64BIT
        select CPU_R4000_WORKAROUNDS if 64BIT


@@ -177,38 +182,6 @@ config LEMOTE_FULONG
          Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
          an FPGA northbridge
 
          Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
          an FPGA northbridge
 

-config MIPS_ATLAS
-       bool "MIPS Atlas board"
-       select BOOT_ELF32
-       select BOOT_RAW
-       select CEVT_R4K
-       select CSRC_R4K
-       select DMA_NONCOHERENT
-       select SYS_HAS_EARLY_PRINTK
-       select IRQ_CPU
-       select HW_HAS_PCI
-       select MIPS_BOARDS_GEN
-       select MIPS_BONITO64
-       select PCI_GT64XXX_PCI0
-       select MIPS_MSC
-       select RM7000_CPU_SCACHE
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_HAS_CPU_MIPS64_R1
-       select SYS_HAS_CPU_NEVADA
-       select SYS_HAS_CPU_RM7000
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
-       select SYS_SUPPORTS_SMARTMIPS
-       select GENERIC_HARDIRQS_NO__DO_IRQ
-       help
-         This enables support for the MIPS Technologies Atlas evaluation
-         board.
-

 config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
 config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC


@@ -219,6 +192,7 @@ config MIPS_MALTA
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select IRQ_CPU
        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


@@ -238,32 +212,13 @@ config MIPS_MALTA
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN

+       select SYS_SUPPORTS_MIPS_CMP if BROKEN  # because SYNC_R4K is broken

        select SYS_SUPPORTS_MULTITHREADING
        select SYS_SUPPORTS_SMARTMIPS
        help
          This enables support for the MIPS Technologies Malta evaluation
          board.
 
        select SYS_SUPPORTS_MULTITHREADING
        select SYS_SUPPORTS_SMARTMIPS
        help
          This enables support for the MIPS Technologies Malta evaluation
          board.
 

-config MIPS_SEAD
-       bool "MIPS SEAD board"
-       select CEVT_R4K
-       select CSRC_R4K
-       select IRQ_CPU
-       select DMA_NONCOHERENT
-       select SYS_HAS_EARLY_PRINTK
-       select MIPS_BOARDS_GEN
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_HAS_CPU_MIPS64_R1
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_SMARTMIPS
-       help
-         This enables support for the MIPS Technologies SEAD evaluation
-         board.
-

 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select CEVT_R4K
 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select CEVT_R4K


@@ -307,12 +262,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
 


@@ -327,7 +282,6 @@ config PMC_MSP
        select SYS_HAS_CPU_MIPS32_R2
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_HAS_CPU_MIPS32_R2
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

-       select SYS_SUPPORTS_KGDB

        select IRQ_CPU
        select SERIAL_8250
        select SERIAL_8250_CONSOLE
        select IRQ_CPU
        select SERIAL_8250
        select SERIAL_8250_CONSOLE


@@ -353,7 +307,6 @@ config PMC_YOSEMITE
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM

-       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_SMP
        help
          Yosemite is an evaluation board for the RM9000x2 processor
        select SYS_SUPPORTS_SMP
        help
          Yosemite is an evaluation board for the RM9000x2 processor


@@ -377,6 +330,7 @@ config SGI_IP22
        select SGI_HAS_DS1286
        select SGI_HAS_I8042
        select SGI_HAS_INDYDOG
        select SGI_HAS_DS1286
        select SGI_HAS_I8042
        select SGI_HAS_INDYDOG

+       select SGI_HAS_HAL2

        select SGI_HAS_SEEQ
        select SGI_HAS_WD93
        select SGI_HAS_ZILOG
        select SGI_HAS_SEEQ
        select SGI_HAS_WD93
        select SGI_HAS_ZILOG


@@ -405,7 +359,6 @@ config SGI_IP27
        select SYS_HAS_CPU_R10000
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_HAS_CPU_R10000
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

-       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_NUMA
        select SYS_SUPPORTS_SMP
        select GENERIC_HARDIRQS_NO__DO_IRQ
        select SYS_SUPPORTS_NUMA
        select SYS_SUPPORTS_SMP
        select GENERIC_HARDIRQS_NO__DO_IRQ


@@ -432,6 +385,7 @@ config SGI_IP28
        select SGI_HAS_DS1286
        select SGI_HAS_I8042
        select SGI_HAS_INDYDOG
        select SGI_HAS_DS1286
        select SGI_HAS_I8042
        select SGI_HAS_INDYDOG

+       select SGI_HAS_HAL2

        select SGI_HAS_SEEQ
        select SGI_HAS_WD93
        select SGI_HAS_ZILOG
        select SGI_HAS_SEEQ
        select SGI_HAS_WD93
        select SGI_HAS_ZILOG


@@ -520,7 +474,6 @@ config SIBYTE_SWARM
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM

-       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select ZONE_DMA32 if 64BIT
 
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select ZONE_DMA32 if 64BIT
 


@@ -597,64 +550,29 @@ config SNI_RM
          Technology and now in turn merged with Fujitsu.  Say Y here to
          support this machine type.
 
          Technology and now in turn merged with Fujitsu.  Say Y here to
          support this machine type.
 

-config TOSHIBA_JMR3927
-       bool "Toshiba JMR-TX3927 board"
-       select CEVT_TXX9
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select MIPS_TX3927
-       select IRQ_TXX9
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_TX39XX
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select GENERIC_HARDIRQS_NO__DO_IRQ
+config MACH_TX39XX
+       bool "Toshiba TX39 series based machines"

 
 

-config TOSHIBA_RBTX4927
-       bool "Toshiba RBTX49[23]7 board"
-       select CEVT_R4K
-       select CSRC_R4K
-       select CEVT_TXX9
-       select DMA_NONCOHERENT
-       select HAS_TXX9_SERIAL
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select IRQ_TXX9
-       select I8259 if TOSHIBA_FPCIB0
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_TX49XX
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_KGDB
-       select GENERIC_HARDIRQS_NO__DO_IRQ
-       help
-         This Toshiba board is based on the TX4927 processor. Say Y here to
-         support this machine type
+config MACH_TX49XX
+       bool "Toshiba TX49 series based machines"

 
 

-config TOSHIBA_RBTX4938
-       bool "Toshiba RBTX4938 board"
+config MIKROTIK_RB532
+       bool "Mikrotik RB532 boards"

        select CEVT_R4K
        select CSRC_R4K
        select CEVT_R4K
        select CSRC_R4K

-       select CEVT_TXX9

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select HAS_TXX9_SERIAL
+       select GENERIC_HARDIRQS_NO__DO_IRQ

        select HW_HAS_PCI
        select IRQ_CPU
        select HW_HAS_PCI
        select IRQ_CPU

-       select IRQ_TXX9
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_TX49XX
+       select SYS_HAS_CPU_MIPS32_R1

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN

-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_KGDB
-       select GENERIC_HARDIRQS_NO__DO_IRQ
-       select GENERIC_GPIO
+       select SWAP_IO_SPACE
+       select BOOT_RAW
+       select ARCH_REQUIRE_GPIOLIB

        help
        help

-         This Toshiba board is based on the TX4938 processor. Say Y here to
-         support this machine type
+         Support the Mikrotik(tm) RouterBoard 532 series,
+         based on the IDT RC32434 SoC.

 
 config WR_PPMC
        bool "Wind River PPMC board"
 
 config WR_PPMC
        bool "Wind River PPMC board"


@@ -681,15 +599,14 @@ config WR_PPMC
 
 endchoice
 
 
 endchoice
 

-source "arch/mips/au1000/Kconfig"
+source "arch/mips/alchemy/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/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/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/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"

-source "arch/mips/tx4927/Kconfig"
-source "arch/mips/tx4938/Kconfig"
+source "arch/mips/txx9/Kconfig"

 source "arch/mips/vr41xx/Kconfig"
 
 endmenu
 source "arch/mips/vr41xx/Kconfig"
 
 endmenu


@@ -760,6 +677,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 +695,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 ARCH_REQUIRE_GPIOLIB
+       bool
+

 config CFE
        bool
 
 config CFE
        bool
 


@@ -833,6 +761,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
 


@@ -902,6 +833,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
 


@@ -911,10 +845,6 @@ config PCI_GT64XXX_PCI0
 config NO_EXCEPT_FILL
        bool
 
 config NO_EXCEPT_FILL
        bool
 

-config MIPS_TX3927
-       bool
-       select HAS_TXX9_SERIAL
-

 config MIPS_RM9122
        bool
        select SERIAL_RM9000
 config MIPS_RM9122
        bool
        select SERIAL_RM9000


@@ -931,7 +861,6 @@ config SOC_PNX8550
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL
        select GENERIC_HARDIRQS_NO__DO_IRQ
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL
        select GENERIC_HARDIRQS_NO__DO_IRQ

-       select SYS_SUPPORTS_KGDB

        select GENERIC_GPIO
 
 config SWAP_IO_SPACE
        select GENERIC_GPIO
 
 config SWAP_IO_SPACE


@@ -951,6 +880,9 @@ config SGI_HAS_DS1286
 config SGI_HAS_INDYDOG
        bool
 
 config SGI_HAS_INDYDOG
        bool
 

+config SGI_HAS_HAL2
+       bool
+

 config SGI_HAS_SEEQ
        bool
 
 config SGI_HAS_SEEQ
        bool
 


@@ -977,8 +909,8 @@ config BOOT_ELF32
 
 config MIPS_L1_CACHE_SHIFT
        int
 
 config MIPS_L1_CACHE_SHIFT
        int

-       default "4" if MACH_DECSTATION
-       default "7" if SGI_IP27 || SGI_IP28 || SNI_RM
+       default "4" if MACH_DECSTATION || MIKROTIK_RB532
+       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"
 


@@ -1337,6 +1269,13 @@ config CPU_SUPPORTS_32BIT_KERNEL
 config CPU_SUPPORTS_64BIT_KERNEL
        bool
 
 config CPU_SUPPORTS_64BIT_KERNEL
        bool
 

+#
+# Set to y for ptrace access to watch registers.
+#
+config HARDWARE_WATCHPOINTS
+       bool
+       default y if CPU_MIPS32 || CPU_MIPS64
+

 menu "Kernel type"
 
 choice
 menu "Kernel type"
 
 choice


@@ -1468,7 +1407,6 @@ config MIPS_MT_SMTC
        depends on CPU_MIPS32_R2
        #depends on CPU_MIPS64_R2               # once there is hardware ...
        depends on SYS_SUPPORTS_MULTITHREADING
        depends on CPU_MIPS32_R2
        #depends on CPU_MIPS64_R2               # once there is hardware ...
        depends on SYS_SUPPORTS_MULTITHREADING

-       select GENERIC_CLOCKEVENTS_BROADCAST

        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_IRQ_EI
        select MIPS_MT
        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_IRQ_EI
        select MIPS_MT


@@ -1516,32 +1454,17 @@ config MIPS_VPE_LOADER
          Includes a loader for loading an elf relocatable object
          onto another VPE and running it.
 
          Includes a loader for loading an elf relocatable object
          onto another VPE and running it.
 

-config MIPS_MT_SMTC_INSTANT_REPLAY
-       bool "Low-latency Dispatch of Deferred SMTC IPIs"
-       depends on MIPS_MT_SMTC && !PREEMPT
-       default y
-       help
-         SMTC pseudo-interrupts between TCs are deferred and queued
-         if the target TC is interrupt-inhibited (IXMT). In the first
-         SMTC prototypes, these queued IPIs were serviced on return
-         to user mode, or on entry into the kernel idle loop. The
-         INSTANT_REPLAY option dispatches them as part of local_irq_restore()
-         processing, which adds runtime overhead (hence the option to turn
-         it off), but ensures that IPIs are handled promptly even under
-         heavy I/O interrupt load.
-

 config MIPS_MT_SMTC_IM_BACKSTOP
        bool "Use per-TC register bits as backstop for inhibited IM bits"
        depends on MIPS_MT_SMTC
 config MIPS_MT_SMTC_IM_BACKSTOP
        bool "Use per-TC register bits as backstop for inhibited IM bits"
        depends on MIPS_MT_SMTC

-       default y
+       default n

        help
          To support multiple TC microthreads acting as "CPUs" within
          a VPE, VPE-wide interrupt mask bits must be specially manipulated
          during interrupt handling. To support legacy drivers and interrupt
          controller management code, SMTC has a "backstop" to track and
          if necessary restore the interrupt mask. This has some performance
        help
          To support multiple TC microthreads acting as "CPUs" within
          a VPE, VPE-wide interrupt mask bits must be specially manipulated
          during interrupt handling. To support legacy drivers and interrupt
          controller management code, SMTC has a "backstop" to track and
          if necessary restore the interrupt mask. This has some performance

-         impact on interrupt service overhead. Disable it only if you know
-         what you are doing.
+         impact on interrupt service overhead.

 
 config MIPS_MT_SMTC_IRQAFF
        bool "Support IRQ affinity API"
 
 config MIPS_MT_SMTC_IRQAFF
        bool "Support IRQ affinity API"


@@ -1551,10 +1474,8 @@ config MIPS_MT_SMTC_IRQAFF
          Enables SMP IRQ affinity API (/proc/irq/*/smp_affinity, etc.)
          for SMTC Linux kernel. Requires platform support, of which
          an example can be found in the MIPS kernel i8259 and Malta
          Enables SMP IRQ affinity API (/proc/irq/*/smp_affinity, etc.)
          for SMTC Linux kernel. Requires platform support, of which
          an example can be found in the MIPS kernel i8259 and Malta

-         platform code.  It is recommended that MIPS_MT_SMTC_INSTANT_REPLAY
-         be enabled if MIPS_MT_SMTC_IRQAFF is used. Adds overhead to
-         interrupt dispatch, and should be used only if you know what
-         you are doing.
+         platform code.  Adds some overhead to interrupt dispatch, and
+         should be used only if you know what you are doing.

 
 config MIPS_VPE_LOADER_TOM
        bool "Load VPE program into memory hidden from linux"
 
 config MIPS_VPE_LOADER_TOM
        bool "Load VPE program into memory hidden from linux"


@@ -1582,6 +1503,18 @@ config MIPS_APSP_KSPD
          "exit" syscall notifying other kernel modules the SP program is
          exiting.  You probably want to say yes here.
 
          "exit" syscall notifying other kernel modules the SP program is
          exiting.  You probably want to say yes here.
 

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

 config SB1_PASS_1_WORKAROUNDS
        bool
        depends on CPU_SB1_PASS_1
 config SB1_PASS_1_WORKAROUNDS
        bool
        depends on CPU_SB1_PASS_1


@@ -1735,6 +1668,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


@@ -1749,14 +1683,17 @@ 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.
 
 config SMP_UP
        bool
 
 
          If you don't know what to do here, say N.
 
 config SMP_UP
        bool
 

+config SYS_SUPPORTS_MIPS_CMP
+       bool
+

 config SYS_SUPPORTS_SMP
        bool
 
 config SYS_SUPPORTS_SMP
        bool
 


@@ -1817,7 +1754,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


@@ -1939,6 +1876,17 @@ config STACKTRACE_SUPPORT
 
 source "init/Kconfig"
 
 
 source "init/Kconfig"
 

+config PROBE_INITRD_HEADER
+       bool "Probe initrd header created by addinitrd"
+       depends on BLK_DEV_INITRD
+       help
+         Probe initrd header at the last page of kernel image.
+         Say Y here if you are using arch/mips/boot/addinitrd.c to
+         add initrd or initramfs image to the kernel image.
+         Otherwise, say N.
+
+source "kernel/Kconfig.freezer"
+

 menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
 
 config HW_HAS_EISA
 menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
 
 config HW_HAS_EISA


@@ -1956,11 +1904,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
 


@@ -2030,10 +1973,6 @@ source "fs/Kconfig.binfmt"
 config TRAD_SIGNALS
        bool
 
 config TRAD_SIGNALS
        bool
 

-config BINFMT_IRIX
-       bool "Include IRIX binary compatibility"
-       depends on CPU_BIG_ENDIAN && 32BIT && BROKEN
-

 config MIPS32_COMPAT
        bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
        depends on 64BIT
 config MIPS32_COMPAT
        bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
        depends on 64BIT


@@ -2081,6 +2020,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


@@ -2091,8 +2034,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"