staging: zcache: adjustments to config/build files due to renaming

[V2: no code changes, patchset now generated via git format-patch -M]

In staging/zcache, adjust config/build due to ramster->zcache renaming

Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 3abf6619dace58319beee2be2fba640d02f059d2..c1dbd0459d01d6b1c415814bbab70818ebab7506 100644 (file)
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -1,23 +1,18 @@
-config ZCACHE2
+config ZCACHE
        bool "Dynamic compression of swap pages and clean pagecache pages"
-       depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP && !ZCACHE 
+       depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP
        select CRYPTO_LZO
        default n
        help
-         Zcache2 doubles RAM efficiency while providing a significant
-         performance boosts on many workloads.  Zcache2 uses
+         Zcache doubles RAM efficiency while providing a significant
+         performance boosts on many workloads.  Zcache uses
          compression and an in-kernel implementation of transcendent
          memory to store clean page cache pages and swap in RAM,
-         providing a noticeable reduction in disk I/O.  Zcache2
-         is a complete rewrite of the older zcache; it was intended to
-         be a merge but that has been blocked due to political and
-         technical disagreements.  It is intended that they will merge
-         again in the future.  Until then, zcache2 is a single-node
-         version of ramster.
+         providing a noticeable reduction in disk I/O.
 
 config RAMSTER
        bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
-       depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE2=y
+       depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y
        depends on NET
        # must ensure struct page is 8-byte aligned
        select HAVE_ALIGNED_STRUCT_PAGE if !64_BIT

diff --git a/drivers/staging/zcache/Makefile b/drivers/staging/zcache/Makefile
index 2d8b9d0a6a8bc593378598de724a6e3f47de5559..471104957dadaaa3e851359510793c6cd49407a0 100644 (file)
--- a/drivers/staging/zcache/Makefile
+++ b/drivers/staging/zcache/Makefile
@@ -3,4 +3,4 @@ zcache-$(CONFIG_RAMSTER)        +=      ramster/ramster.o ramster/r2net.o
 zcache-$(CONFIG_RAMSTER)       +=      ramster/nodemanager.o ramster/tcp.o
 zcache-$(CONFIG_RAMSTER)       +=      ramster/heartbeat.o ramster/masklog.o
 
-obj-$(CONFIG_ZCACHE2)  +=      zcache.o
+obj-$(CONFIG_ZCACHE)   +=      zcache.o