Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[~andy/linux] / drivers / staging / zcache / Kconfig

diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 5c3714530961c5ede430f7745706d24c833781ce..2d7b2da3b9e0a2e5d707f6db9a502882c5c3c650 100644 (file)
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -1,5 +1,5 @@
 config ZCACHE
-       bool "Dynamic compression of swap pages and clean pagecache pages"
+       tristate "Dynamic compression of swap pages and clean pagecache pages"
        depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP
        select CRYPTO_LZO
        default n
@@ -10,9 +10,17 @@ config ZCACHE
          memory to store clean page cache pages and swap in RAM,
          providing a noticeable reduction in disk I/O.
 
+config ZCACHE_DEBUG
+       bool "Enable debug statistics"
+       depends on DEBUG_FS && ZCACHE
+       default n
+       help
+         This is used to provide an debugfs directory with counters of
+         how zcache is doing. You probably want to set this to 'N'.
+
 config RAMSTER
-       bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
-       depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y
+       tristate "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
+       depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE
        depends on NET
        # must ensure struct page is 8-byte aligned
        select HAVE_ALIGNED_STRUCT_PAGE if !64BIT
@@ -25,6 +33,14 @@ config RAMSTER
          zcache2, compresses swap pages into local RAM, but then remotifies
          the compressed pages to another node in the RAMster cluster.
 
+config RAMSTER_DEBUG
+        bool "Enable ramster debug statistics"
+        depends on DEBUG_FS && RAMSTER
+        default n
+        help
+          This is used to provide an debugfs directory with counters of
+          how ramster is doing. You probably want to set this to 'N'.
+
 # Depends on not-yet-upstreamed mm patches to export end_swap_bio_write and
 # __add_to_swap_cache, and implement __swap_writepage (which is swap_writepage
 # without the frontswap call. When these are in-tree, the dependency on