Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 7c56971..c882b8e 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -137,6 +137,9 @@ config HAVE_MEMBLOCK_NODE_MAP
 config ARCH_DISCARD_MEMBLOCK
        boolean
 
+config NO_BOOTMEM
+       boolean
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
@@ -310,7 +313,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
 
 config TRANSPARENT_HUGEPAGE
        bool "Transparent Hugepage Support"
-       depends on X86 && MMU
+       depends on X86 && !XEN && MMU
        select COMPACTION
        help
          Transparent Hugepages allows the kernel to use huge pages and
@@ -362,7 +365,7 @@ config CLEANCACHE
          for clean pages that the kernel's pageframe replacement algorithm
          (PFRA) would like to keep around, but can't since there isn't enough
          memory.  So when the PFRA "evicts" a page, it first attempts to use
-         cleancacne code to put the data contained in that page into
+         cleancache code to put the data contained in that page into
          "transcendent memory", memory that is not directly accessible or
          addressable by the kernel and is of unknown and possibly
          time-varying size.  And when a cleancache-enabled
@@ -376,3 +379,20 @@ config CLEANCACHE
          in a negligible performance hit.
 
          If unsure, say Y to enable cleancache
+
+config FRONTSWAP
+       bool "Enable frontswap to cache swap pages if tmem is present"
+       depends on SWAP
+       default n
+       help
+         Frontswap is so named because it can be thought of as the opposite
+         of a "backing" store for a swap device.  The data is stored into
+         "transcendent memory", memory that is not directly accessible or
+         addressable by the kernel and is of unknown and possibly
+         time-varying size.  When space in transcendent memory is available,
+         a significant swap I/O reduction may be achieved.  When none is
+         available, all frontswap calls are reduced to a single pointer-
+         compare-against-NULL resulting in a negligible performance hit
+         and swap data is stored as normal on the matching swap device.
+
+         If unsure, say Y to enable frontswap.