From 64990d1a4890a507a1c7bf81b6d0ca6c1bbbad1c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 29 Jun 2009 10:57:46 +0100 Subject: [PATCH] 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 --- drivers/xen/blktap2/device.c | 3 ++- drivers/xen/blktap2/sysfs.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/xen/blktap2/device.c b/drivers/xen/blktap2/device.c index 3b5118dc..90860de1 100644 --- a/drivers/xen/blktap2/device.c +++ b/drivers/xen/blktap2/device.c @@ -401,7 +401,8 @@ blktap_device_finish_request(struct blktap *tap, uptodate = (res->status == BLKIF_RSP_OKAY); 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 --git a/drivers/xen/blktap2/sysfs.c b/drivers/xen/blktap2/sysfs.c index 5a2e098b..919a2467 100644 --- a/drivers/xen/blktap2/sysfs.c +++ b/drivers/xen/blktap2/sysfs.c @@ -270,7 +270,7 @@ blktap_sysfs_debug_device(struct class_device *dev, char *buf) 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); -- 2.39.5