From 9653c324fe5c15a90ab9d0b95ddf854fde971648 Mon Sep 17 00:00:00 2001
From: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Sun, 6 Feb 2011 19:27:09 -0800
Subject: [PATCH] --- yaml --- r: 235918 b: refs/heads/master c:
 6630889735ec3d950b4f1496ada77df287d8ee1b h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/Kconfig         |  2 ++
 trunk/drivers/staging/Makefile        |  1 +
 trunk/drivers/staging/zcache/Kconfig  | 13 +++++++++++++
 trunk/drivers/staging/zcache/Makefile |  1 +
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 trunk/drivers/staging/zcache/Kconfig
 create mode 100644 trunk/drivers/staging/zcache/Makefile

diff --git a/[refs] b/[refs]
index c267145232ed..3d6218c24d48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cc06bf88d554dd527ded26eab28eec6a0d0e3df
+refs/heads/master: 6630889735ec3d950b4f1496ada77df287d8ee1b
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index b80755da5394..118bf525b931 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -127,6 +127,8 @@ source "drivers/staging/cs5535_gpio/Kconfig"
 
 source "drivers/staging/zram/Kconfig"
 
+source "drivers/staging/zcache/Kconfig"
+
 source "drivers/staging/wlags49_h2/Kconfig"
 
 source "drivers/staging/wlags49_h25/Kconfig"
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index fd26509e5efa..625bae215eda 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)		+= iio/
 obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio/
 obj-$(CONFIG_ZRAM)		+= zram/
+obj-$(CONFIG_ZCACHE)		+= zcache/
 obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/
 obj-$(CONFIG_SAMSUNG_LAPTOP)	+= samsung-laptop/
diff --git a/trunk/drivers/staging/zcache/Kconfig b/trunk/drivers/staging/zcache/Kconfig
new file mode 100644
index 000000000000..7fabcb2bc80d
--- /dev/null
+++ b/trunk/drivers/staging/zcache/Kconfig
@@ -0,0 +1,13 @@
+config ZCACHE
+	tristate "Dynamic compression of swap pages and clean pagecache pages"
+	depends on CLEANCACHE || FRONTSWAP
+	select XVMALLOC
+	select LZO_COMPRESS
+	select LZO_DECOMPRESS
+	default n
+	help
+	  Zcache doubles RAM efficiency while providing a significant
+	  performance boosts on many workloads.  Zcache uses lzo1x
+	  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.
diff --git a/trunk/drivers/staging/zcache/Makefile b/trunk/drivers/staging/zcache/Makefile
new file mode 100644
index 000000000000..7f64de4dff3b
--- /dev/null
+++ b/trunk/drivers/staging/zcache/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ZCACHE)	+=	zcache.o tmem.o