[<prev] [next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1008300905290.28923@ayla.of.borg>
Date: Mon, 30 Aug 2010 09:07:27 +0200 (CEST)
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Jens Axboe <axboe@...nel.dk>
cc: Andrew Morton <akpm@...ux-foundation.org>,
Linux Kernel Development <linux-kernel@...r.kernel.org>
Subject: [PATCH] block/m68k: z2ram - correct printing of sector_t
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@...ux-m68k.org>
---
drivers/block/z2ram.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index d75b2bb..2dbcaaa 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -79,8 +79,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;
}
--
1.7.0.4
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists