From 55eeb3f55b5d1af17576be294c4bc64fc8b7615f Mon Sep 17 00:00:00 2001
From: Robert Jennings <rcj@linux.vnet.ibm.com>
Date: Fri, 28 Jan 2011 08:59:26 -0600
Subject: [PATCH] --- yaml --- r: 235847 b: refs/heads/master c:
 b1f5b81ebeee3974a8c793cafacace991d9a864d h: refs/heads/master i:   235845:
 1f5fc46c5af0074dc40bcbf1f2bb401cda36bbe2   235843:
 b7901b25c718e14064e83e89a0c367134f1f3cd6   235839:
 8f774e589d62e98abaddfafd0aedf60fddbba9e2 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/zram/Kconfig    | 8 ++++++++
 trunk/drivers/staging/zram/xvmalloc.c | 4 ++++
 trunk/drivers/staging/zram/zram_drv.c | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 48feb0585fa7..49b9319a56f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f201b541ff6748db77b857d2ae69fc9dbbee11
+refs/heads/master: b1f5b81ebeee3974a8c793cafacace991d9a864d
diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig
index d3982e6fdb40..2f3b484ce5a4 100644
--- a/trunk/drivers/staging/zram/Kconfig
+++ b/trunk/drivers/staging/zram/Kconfig
@@ -15,3 +15,11 @@ config ZRAM
 
 	  See zram.txt for more information.
 	  Project home: http://compcache.googlecode.com/
+
+config ZRAM_DEBUG
+	bool "Compressed RAM block device debug support"
+	depends on ZRAM
+	default n
+	help
+	  This option adds additional debugging code to the compressed
+	  RAM block device driver.
diff --git a/trunk/drivers/staging/zram/xvmalloc.c b/trunk/drivers/staging/zram/xvmalloc.c
index 9cbe04a496e1..4f6cb8de6865 100644
--- a/trunk/drivers/staging/zram/xvmalloc.c
+++ b/trunk/drivers/staging/zram/xvmalloc.c
@@ -10,6 +10,10 @@
  * Released under the terms of GNU General Public License Version 2.0
  */
 
+#ifdef CONFIG_ZRAM_DEBUG
+#define DEBUG
+#endif
+
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/highmem.h>
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
index 3c8ecab70e97..7d11c595c7d2 100644
--- a/trunk/drivers/staging/zram/zram_drv.c
+++ b/trunk/drivers/staging/zram/zram_drv.c
@@ -15,6 +15,10 @@
 #define KMSG_COMPONENT "zram"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#ifdef CONFIG_ZRAM_DEBUG
+#define DEBUG
+#endif
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/bio.h>