# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1246269466 -3600
# Node ID c995a3160b7e6da90d1ac45c7a558f76384605e2
# Parent  444a9ed5dfdefb1b7d4a765b7a110e1e74116540
blktap2: remove warnings.

This patch removes the following warnings on ia64.

> linux-2.6.18-xen.hg/drivers/xen/blktap2/device.c: In function
  'blktap_device_finish_request':
> linux-2.6.18-xen.hg/drivers/xen/blktap2/device.c:403: warning:
  format '%lld' expects type 'long long int', but argument 7 has type 'uint64_t'
> linux-2.6.18-xen.hg/drivers/xen/blktap2/sysfs.c: In function
  'blktap_sysfs_debug_device':
> linux-2.6.18-xen.hg/drivers/xen/blktap2/sysfs.c:276: warning: format
  '%llu' expects type 'long long unsigned int', but argument 4 has type
  'uint64_t'

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 444a9ed5dfde -r c995a3160b7e drivers/xen/blktap/device.c
--- a/drivers/xen/blktap/device.c	Thu Jun 04 10:46:54 2009 +0100
+++ b/drivers/xen/blktap/device.c	Mon Jun 29 10:57:46 2009 +0100
@@ -400,7 +400,8 @@
 	ret = res->status == BLKIF_RSP_OKAY ? 0 : -EIO;
 
 	BTDBG("req %p res status %d operation %d/%d id %lld\n", req,
-		res->status, res->operation, request->operation, res->id);
+	      res->status, res->operation, request->operation,
+	      (unsigned long long)res->id);
 
 	switch (request->operation) {
 	case BLKIF_OP_READ:
diff -r 444a9ed5dfde -r c995a3160b7e drivers/xen/blktap/sysfs.c
--- a/drivers/xen/blktap/sysfs.c	Thu Jun 04 10:46:54 2009 +0100
+++ b/drivers/xen/blktap/sysfs.c	Mon Jun 29 10:57:46 2009 +0100
@@ -276,7 +276,7 @@
 		tmp += sprintf(tmp, "req %d: id: %llu, usr_idx: %d, "
 			       "status: 0x%02x, pendcnt: %d, "
 			       "nr_pages: %u, op: %d, time: %lu:%lu\n",
-			       i, req->id, req->usr_idx,
+			       i, (unsigned long long)req->id, req->usr_idx,
 			       req->status, atomic_read(&req->pendcnt),
 			       req->nr_pages, req->operation, req->time.tv_sec,
 			       req->time.tv_usec);