The patch titled
Subject: zram: fix printk formats in zram_drv.c
has been removed from the -mm tree. Its filename was
zram-introduce-zram-memory-tracking-update-fix-fix-fix-fix.patch
This patch was dropped because it was folded into zram-introduce-zram-memory-tracking.patch
------------------------------------------------------
From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Subject: zram: fix printk formats in zram_drv.c
Fix printk format warnings (seen on i386 build):
../drivers/block/zram/zram_drv.c:678:4: warning: format `%lu' expects argument of type `long unsigned int', but argument 4 has type `ssize_t' [-Wformat=]
../drivers/block/zram/zram_drv.c:678:4: warning: format `%lu' expects argument of type `long unsigned int', but argument 5 has type `time64_t' [-Wformat=]
time64_t is 64 bits (and signed), so printing it should use %lld,
not %ld. %ld (long) is only 32 bits on several architectures.
Link: http://lkml.kernel.org/r/3652ccb1-96ef-0b0b-05d1-f661d7733dcc@xxxxxxxxxxxxx
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/block/zram/zram_drv.c~zram-introduce-zram-memory-tracking-update-fix-fix-fix-fix drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-introduce-zram-memory-tracking-update-fix-fix-fix-fix
+++ a/drivers/block/zram/zram_drv.c
@@ -671,7 +671,7 @@ static ssize_t read_block_state(struct f
ts = ktime_to_timespec64(zram->table[index].ac_time);
copied = snprintf(kbuf + written, count,
- "%12zd %12lld.%06ld %c%c%c\n",
+ "%12zd %12lld.%06lu %c%c%c\n",
index, (s64)ts.tv_sec,
ts.tv_nsec / NSEC_PER_USEC,
zram_test_flag(zram, index, ZRAM_SAME) ? 's' : '.',
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are
zram-introduce-zram-memory-tracking.patch
lib-ucs2_string-add-module_license.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
