diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 09:26:49 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 09:26:49 -0700 |
| commit | 692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch) | |
| tree | a9e49c040d361ea2293a8966832378def5a06714 /drivers/xen/privcmd.c | |
| parent | e4dbedc7eac7da9db363a36f2bd4366962eeefcc (diff) | |
| parent | e2c3ecf0ea8e87c5209371af7da107ebc47a5639 (diff) | |
| download | linux-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.gz | |
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'drivers/xen/privcmd.c')
| -rw-r--r-- | drivers/xen/privcmd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 8e74590fa1bb..569a13b9e856 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -533,12 +533,17 @@ static void privcmd_close(struct vm_area_struct *vma) { struct page **pages = vma->vm_private_data; int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + int rc; if (!xen_feature(XENFEAT_auto_translated_physmap) || !numpgs || !pages) return; - xen_unmap_domain_mfn_range(vma, numpgs, pages); - free_xenballooned_pages(numpgs, pages); + rc = xen_unmap_domain_mfn_range(vma, numpgs, pages); + if (rc == 0) + free_xenballooned_pages(numpgs, pages); + else + pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n", + numpgs, rc); kfree(pages); } |