Merge commit 'v2.6.39-rc3' into for-2.6.39

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

diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig
index 7b0bc44..bc5e976 100644 (file)
--- a/arch/mips/sgi-ip27/Kconfig
+++ b/arch/mips/sgi-ip27/Kconfig
@@ -1,46 +1,45 @@
 #config SGI_SN0_XXL
 #      bool "IP27 XXL"
 #      depends on SGI_IP27
-#        This options adds support for userspace processes upto 16TB size.
+#        This options adds support for userspace processes up to 16TB size.
 #        Normally the limit is just .5TB.
 
-config SGI_SN0_N_MODE
-       bool "IP27 N-Mode"
+choice
+       prompt "Node addressing mode"
        depends on SGI_IP27
-       help
-         The nodes of Origin 200, Origin 2000 and Onyx 2 systems can be
-         configured in either N-Modes which allows for more nodes or M-Mode
-         which allows for more memory.  Your system is most probably
-         running in M-Mode, so you should say N here.
+       default SGI_SN_M_MODE
 
-config ARCH_DISCONTIGMEM_ENABLE
-       bool
-       default y if SGI_IP27
+config SGI_SN_M_MODE
+       bool "IP27 M-Mode"
        help
-         Say Y to upport efficient handling of discontiguous physical memory,
-         for architectures which are either NUMA (Non-Uniform Memory Access)
-         or have huge holes in the physical address space for other reasons.
-         See <file:Documentation/vm/numa> for more.
+         The nodes of Origin, Onyx, Fuel and Tezro systems can be configured
+         in either N-Modes which allows for more nodes or M-Mode which allows
+         for more memory.  Your hardware is almost certainly running in
+         M-Mode, so choose M-mode here.
 
-config NUMA
-       bool "NUMA Support"
-       depends on SGI_IP27
+config SGI_SN_N_MODE
+       bool "IP27 N-Mode"
+       depends on EXPERIMENTAL
        help
-         Say Y to compile the kernel to support NUMA (Non-Uniform Memory
-         Access).  This option is for configuring high-end multiprocessor
-         server machines.  If in doubt, say N.
+         The nodes of Origin, Onyx, Fuel and Tezro systems can be configured
+         in either N-Modes which allows for more nodes or M-Mode which allows
+         for more memory.  Your hardware is almost certainly running in
+         M-Mode, so choose M-mode here.
+
+endchoice
 
 config MAPPED_KERNEL
        bool "Mapped kernel support"
        depends on SGI_IP27
        help
          Change the way a Linux kernel is loaded into memory on a MIPS64
-         machine.  This is required in order to support text replication and
+         machine.  This is required in order to support text replication on
          NUMA.  If you need to understand it, read the source code.
 
 config REPLICATE_KTEXT
        bool "Kernel text replication support"
        depends on SGI_IP27
+       select MAPPED_KERNEL
        help
          Say Y here to enable replicating the kernel text across multiple
          nodes in a NUMA cluster.  This trades memory for speed.