diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-10-28 06:15:26 -0600 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-28 06:15:26 -0600 |
| commit | e1fbd9210d5d172f951b1d21eb58383919c4d10d (patch) | |
| tree | 487ba732770ea2f3ef39f57161a795477feaf6a6 /drivers/block | |
| parent | 5ad21a337420e82bffb7836ab34027dd7ad624b8 (diff) | |
| download | op-kernel-dev-e1fbd9210d5d172f951b1d21eb58383919c4d10d.zip op-kernel-dev-e1fbd9210d5d172f951b1d21eb58383919c4d10d.tar.gz | |
drivers/block/z2ram.c: 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@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | 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 dcd4cfc..a22e3f8 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; } |
