diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2012-10-17 16:37:49 -0400 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2012-11-29 07:57:36 -0500 |
commit | 9a032e393a8bc888a9b0c898cbdb9db2cee7b536 (patch) | |
tree | da8d1705a10d2728627d3c13c64f6de5881d177d /drivers/xen/privcmd.c | |
parent | b3e40b72bb24237b0aee9f6ba2e9f88dd4ff3c0a (diff) |
xen: add pages parameter to xen_remap_domain_mfn_range
Also introduce xen_unmap_domain_mfn_range. These are the parts of
Mukesh's "xen/pvh: Implement MMU changes for PVH" which are also
needed as a baseline for ARM privcmd support.
The original patch was:
Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This derivative is also:
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'drivers/xen/privcmd.c')
-rw-r--r-- | drivers/xen/privcmd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 8adb9cc267f9..b612267a8cb6 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c | |||
@@ -178,7 +178,7 @@ static int mmap_mfn_range(void *data, void *state) | |||
178 | msg->va & PAGE_MASK, | 178 | msg->va & PAGE_MASK, |
179 | msg->mfn, msg->npages, | 179 | msg->mfn, msg->npages, |
180 | vma->vm_page_prot, | 180 | vma->vm_page_prot, |
181 | st->domain); | 181 | st->domain, NULL); |
182 | if (rc < 0) | 182 | if (rc < 0) |
183 | return rc; | 183 | return rc; |
184 | 184 | ||
@@ -267,7 +267,8 @@ static int mmap_batch_fn(void *data, void *state) | |||
267 | int ret; | 267 | int ret; |
268 | 268 | ||
269 | ret = xen_remap_domain_mfn_range(st->vma, st->va & PAGE_MASK, *mfnp, 1, | 269 | ret = xen_remap_domain_mfn_range(st->vma, st->va & PAGE_MASK, *mfnp, 1, |
270 | st->vma->vm_page_prot, st->domain); | 270 | st->vma->vm_page_prot, st->domain, |
271 | NULL); | ||
271 | 272 | ||
272 | /* Store error code for second pass. */ | 273 | /* Store error code for second pass. */ |
273 | *(st->err++) = ret; | 274 | *(st->err++) = ret; |