The patch titled
drivers/block/z2ram.c: correct printing of sector_t
has been added to the -mm tree. Its filename is
block-m68k-z2ram-correct-printing-of-sector_t.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 ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/block/z2ram.c: correct printing of sector_t
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
If CONFIG_LBDAF=y, `sector_t' becomes `u64' instead of `unsigned long':
drivers/block/z2ram.c: In function ¡do_z2_request¢:
drivers/block/z2ram.c:83: warning: format ¡%lu¢ expects type ¡long unsigned int¢, but argument 2 has type ¡sector_t¢
Hence always cast it to `unsigned long long' for printing. Also do the
pr_err() dance, while we're at it.
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/z2ram.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/block/z2ram.c~block-m68k-z2ram-correct-printing-of-sector_t drivers/block/z2ram.c
--- a/drivers/block/z2ram.c~block-m68k-z2ram-correct-printing-of-sector_t
+++ a/drivers/block/z2ram.c
@@ -80,8 +80,10 @@ static void do_z2_request(struct request
int err = 0;
if (start + len > z2ram_size) {
- printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
- blk_rq_pos(req), blk_rq_cur_sectors(req));
+ pr_err(DEVICE_NAME ": bad access: block=%llu, "
+ "count=%u\n",
+ (unsigned long long)blk_rq_pos(req),
+ blk_rq_cur_sectors(req));
err = -EIO;
goto done;
}
_
Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are
linux-next.patch
drivers-power-ds2782_batteryc-fix-ds2782-battery-driver-units.patch
block-m68k-z2ram-correct-printing-of-sector_t.patch
m68knommu-blackfin-remove-old-assembler-only-flags-bit-definitions.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
