Merge branch 'topic/ctxfi' into for-linus

[pandora-kernel.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 998e5db..25f3b0a 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -72,6 +72,7 @@ config MIPS_COBALT
        select IRQ_CPU
        select IRQ_GT641XX
        select PCI_GT64XXX_PCI0
        select IRQ_CPU
        select IRQ_GT641XX
        select PCI_GT64XXX_PCI0

+       select PCI

        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


@@ -593,7 +594,7 @@ config WR_PPMC
          board, which is based on GT64120 bridge chip.
 
 config CAVIUM_OCTEON_SIMULATOR
          board, which is based on GT64120 bridge chip.
 
 config CAVIUM_OCTEON_SIMULATOR

-       bool "Support for the Cavium Networks Octeon Simulator"
+       bool "Cavium Networks Octeon Simulator"

        select CEVT_R4K
        select 64BIT_PHYS_ADDR
        select DMA_COHERENT
        select CEVT_R4K
        select 64BIT_PHYS_ADDR
        select DMA_COHERENT


@@ -607,7 +608,7 @@ config CAVIUM_OCTEON_SIMULATOR
          hardware.
 
 config CAVIUM_OCTEON_REFERENCE_BOARD
          hardware.
 
 config CAVIUM_OCTEON_REFERENCE_BOARD

-       bool "Support for the Cavium Networks Octeon reference board"
+       bool "Cavium Networks Octeon reference board"

        select CEVT_R4K
        select 64BIT_PHYS_ADDR
        select DMA_COHERENT
        select CEVT_R4K
        select 64BIT_PHYS_ADDR
        select DMA_COHERENT


@@ -1411,13 +1412,12 @@ config PAGE_SIZE_4KB
 
 config PAGE_SIZE_8KB
        bool "8kB"
 
 config PAGE_SIZE_8KB
        bool "8kB"

-       depends on EXPERIMENTAL && CPU_R8000
+       depends on (EXPERIMENTAL && CPU_R8000) || CPU_CAVIUM_OCTEON

        help
          Using 8kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available
        help
          Using 8kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available

-         only on the R8000 processor.  Not that at the time of this writing
-         this option is still high experimental; there are also issues with
-         compatibility of user applications.
+         only on R8000 and cnMIPS processors.  Note that you will need a
+         suitable Linux distribution to support this.

 
 config PAGE_SIZE_16KB
        bool "16kB"
 
 config PAGE_SIZE_16KB
        bool "16kB"


@@ -1428,6 +1428,15 @@ config PAGE_SIZE_16KB
          all non-R3000 family processors.  Note that you will need a suitable
          Linux distribution to support this.
 
          all non-R3000 family processors.  Note that you will need a suitable
          Linux distribution to support this.
 

+config PAGE_SIZE_32KB
+       bool "32kB"
+       depends on CPU_CAVIUM_OCTEON
+       help
+         Using 32kB page size will result in higher performance kernel at
+         the price of higher memory consumption.  This option is available
+         only on cnMIPS cores.  Note that you will need a suitable Linux
+         distribution to support this.
+

 config PAGE_SIZE_64KB
        bool "64kB"
        depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX
 config PAGE_SIZE_64KB
        bool "64kB"
        depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX


@@ -1958,10 +1967,6 @@ config SECCOMP
 
 endmenu
 
 
 endmenu
 

-config RWSEM_GENERIC_SPINLOCK
-       bool
-       default y
-

 config LOCKDEP_SUPPORT
        bool
        default y
 config LOCKDEP_SUPPORT
        bool
        default y