Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3953f41f9caf620410cfd194f85d2b74c13dca6d..a03131b6ba8e7877b537a77fa0c21f5cd005e275 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -325,6 +325,7 @@ config VIRT_TO_BUS
 
 config MMU_NOTIFIER
        bool
+       select SRCU
 
 config KSM
        bool "Enable KSM for page merging"
@@ -601,6 +602,16 @@ config PGTABLE_MAPPING
          You can check speed with zsmalloc benchmark:
          https://github.com/spartacus06/zsmapbench
 
+config ZSMALLOC_STAT
+       bool "Export zsmalloc statistics"
+       depends on ZSMALLOC
+       select DEBUG_FS
+       help
+         This option enables code in the zsmalloc to collect various
+         statistics about whats happening in zsmalloc and exports that
+         information to userspace via debugfs.
+         If unsure, say N.
+
 config GENERIC_EARLY_IOREMAP
        bool