From e1fbd9210d5d172f951b1d21eb58383919c4d10d Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 28 Oct 2010 06:15:26 -0600 Subject: [PATCH] drivers/block/z2ram.c: correct printing of sector_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe --- drivers/block/z2ram.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index dcd4cfcf412..a22e3f89594 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -80,8 +80,10 @@ static void do_z2_request(struct request_queue *q) 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; }