The patch titled Subject: zram: remove obsolete ZRAM_DEBUG option has been added to the -mm tree. Its filename is zram-remove-obsolete-zram_debug-option.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/zram-remove-obsolete-zram_debug-option.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/zram-remove-obsolete-zram_debug-option.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Marcin Jabrzyk <m.jabrzyk@xxxxxxxxxxx> Subject: zram: remove obsolete ZRAM_DEBUG option This config option doesn't provide any usage for zram. Signed-off-by: Marcin Jabrzyk <m.jabrzyk@xxxxxxxxxxx> Acked-by: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Nitin Gupta <ngupta@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/zram/Kconfig | 10 +--------- drivers/block/zram/zram_drv.c | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff -puN drivers/block/zram/Kconfig~zram-remove-obsolete-zram_debug-option drivers/block/zram/Kconfig --- a/drivers/block/zram/Kconfig~zram-remove-obsolete-zram_debug-option +++ a/drivers/block/zram/Kconfig @@ -23,12 +23,4 @@ config ZRAM_LZ4_COMPRESS default n help This option enables LZ4 compression algorithm support. Compression - algorithm can be changed using `comp_algorithm' device attribute. - -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. + algorithm can be changed using `comp_algorithm' device attribute. \ No newline at end of file diff -puN drivers/block/zram/zram_drv.c~zram-remove-obsolete-zram_debug-option drivers/block/zram/zram_drv.c --- a/drivers/block/zram/zram_drv.c~zram-remove-obsolete-zram_debug-option +++ a/drivers/block/zram/zram_drv.c @@ -15,10 +15,6 @@ #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> _ Patches currently in -mm which might be from m.jabrzyk@xxxxxxxxxxx are zram-remove-obsolete-zram_debug-option.patch zsmalloc-remove-obsolete-zsmalloc_debug.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html