git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[pandora-kernel.git]
/
drivers
/
block
/
z2ram.c
diff --git
a/drivers/block/z2ram.c
b/drivers/block/z2ram.c
index
dcd4cfc
..
a22e3f8
100644
(file)
--- 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) {
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;
}
err = -EIO;
goto done;
}