The patch titled
Subject: zram-introduce-zram-memory-tracking-fix
has been removed from the -mm tree. Its filename was
zram-introduce-zram-memory-tracking-fix.patch
This patch was dropped because it was folded into zram-introduce-zram-memory-tracking.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: zram-introduce-zram-memory-tracking-fix
fix i386 printk warning
drivers/block/zram/zram_drv.c: In function read_block_state:
drivers/block/zram/zram_drv.c:683:9: warning: format %lu expects argument of type long unsigned int, but argument 4 has type ssize_t {aka int} [-Wformat=]
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/block/zram/zram_drv.c~zram-introduce-zram-memory-tracking-fix drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-introduce-zram-memory-tracking-fix
+++ a/drivers/block/zram/zram_drv.c
@@ -681,7 +681,8 @@ static ssize_t read_block_state(struct f
usec_rem = do_div(last_access, USEC_PER_SEC);
copied = snprintf(kbuf + written, count,
"%12lu %5lu.%06lu %c%c%c\n",
- index, (unsigned long)last_access, usec_rem,
+ (unsigned long)index, (unsigned long)last_access,
+ usec_rem,
zram_test_flag(zram, index, ZRAM_SAME) ? 's' : '.',
zram_test_flag(zram, index, ZRAM_WB) ? 'w' : '.',
zram_test_flag(zram, index, ZRAM_HUGE) ? 'h' : '.');
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
zram-introduce-zram-memory-tracking.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
revert-autofs-update-fs-autofs4-kconfig-fix.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
