# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1246269466 -3600
# Node ID b086278a440602f2509380d0f718343e910483eb
# Parent dd42cdb0ab895a747727e4e352dfcb27bf5e693d
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>
---
drivers/xen/blktap2/device.c | 3 ++-
drivers/xen/blktap2/sysfs.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -r dd42cdb0ab89 -r b086278a4406 drivers/xen/blktap2/device.c
--- a/drivers/xen/blktap2/device.c Mon Jun 29 12:09:16 2009 +0900
+++ b/drivers/xen/blktap2/device.c Mon Jun 29 10:57:46 2009 +0100
@@ -401,7 +401,8 @@ blktap_device_finish_request(struct blkt
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 -r dd42cdb0ab89 -r b086278a4406 drivers/xen/blktap2/sysfs.c
--- a/drivers/xen/blktap2/sysfs.c Mon Jun 29 12:09:16 2009 +0900
+++ b/drivers/xen/blktap2/sysfs.c Mon Jun 29 10:57:46 2009 +0100
@@ -270,7 +270,7 @@ blktap_sysfs_debug_device(struct class_d
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);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home