aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Jabrzyk <m.jabrzyk@samsung.com>2015-06-25 17:59:55 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 20:00:35 -0400
commit9e65bf68a8f14f1b3fb16dc85dbbaff79da4bfeb (patch)
tree4c7ea59b4d28af42f83fb6725515949dc7d9abd4
parentcf54e2fce51c7ad2479fe8cf213a2ed618a8189b (diff)
zram: remove obsolete ZRAM_DEBUG option
This config option doesn't provide any usage for zram. Signed-off-by: Marcin Jabrzyk <m.jabrzyk@samsung.com> Acked-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Nitin Gupta <ngupta@vflare.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/zram/Kconfig10
-rw-r--r--drivers/block/zram/zram_drv.c4
2 files changed, 1 insertions, 13 deletions
diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig
index 6489c0fd0ea6..386ba3d1a6ee 100644
--- a/drivers/block/zram/Kconfig
+++ b/drivers/block/zram/Kconfig
@@ -23,12 +23,4 @@ config ZRAM_LZ4_COMPRESS
23 default n 23 default n
24 help 24 help
25 This option enables LZ4 compression algorithm support. Compression 25 This option enables LZ4 compression algorithm support. Compression
26 algorithm can be changed using `comp_algorithm' device attribute. 26 algorithm can be changed using `comp_algorithm' device attribute. \ No newline at end of file
27
28config ZRAM_DEBUG
29 bool "Compressed RAM block device debug support"
30 depends on ZRAM
31 default n
32 help
33 This option adds additional debugging code to the compressed
34 RAM block device driver.
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 6e134f4759c0..00e7966e5546 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -15,10 +15,6 @@
15#define KMSG_COMPONENT "zram" 15#define KMSG_COMPONENT "zram"
16#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt 16#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
17 17
18#ifdef CONFIG_ZRAM_DEBUG
19#define DEBUG
20#endif
21
22#include <linux/module.h> 18#include <linux/module.h>
23#include <linux/kernel.h> 19#include <linux/kernel.h>
24#include <linux/bio.h> 20#include <linux/bio.h>