diff --git a/[refs] b/[refs]
index 5e7c413e6504..176b36d946bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad21a337420e82bffb7836ab34027dd7ad624b8
+refs/heads/master: e1fbd9210d5d172f951b1d21eb58383919c4d10d
diff --git a/trunk/drivers/block/z2ram.c b/trunk/drivers/block/z2ram.c
index dcd4cfcf4126..a22e3f895947 100644
--- a/trunk/drivers/block/z2ram.c
+++ b/trunk/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;
 		}