diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:07:20 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:07:20 -0400 |
commit | 5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a (patch) | |
tree | 6edb13ed37d842ef0b70d072b94e4c78010f90cf /drivers/block/xen-blkback/blkback.c | |
parent | c5aa1e554a20fb3542c62688ae46049c9225a965 (diff) | |
parent | 6f0f9b6b3fcfe5e156f20d4f804f0d505c750b3c (diff) |
Merge remote branch 'origin' into for-next
Diffstat (limited to 'drivers/block/xen-blkback/blkback.c')
-rw-r--r-- | drivers/block/xen-blkback/blkback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 73f196ca713..c6decb901e5 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -337,7 +337,7 @@ static void xen_blkbk_unmap(struct pending_req *req) invcount++; } - ret = gnttab_unmap_refs(unmap, pages, invcount, false); + ret = gnttab_unmap_refs(unmap, NULL, pages, invcount); BUG_ON(ret); } |