diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-14 23:58:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-14 23:58:53 -0800 |
| commit | df0c65ec104c8a0c5ccdc02fda56f31ac7fe5bdc (patch) | |
| tree | 7913bec67110cb6d9531d6b72f4c770d9955a81a /drivers/xen/gntdev.c | |
| parent | db87e2310e4eead66d2c29a4d51ec5946dddf0dc (diff) | |
| parent | 3bda2b55b41dacecc8fdf44d9066e54b3a0b827a (diff) | |
Merge "Merge android-4.4.96 (aed4c54) into msm-4.4"
Diffstat (limited to 'drivers/xen/gntdev.c')
| -rw-r--r-- | drivers/xen/gntdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 308600adf6e0..a4d749665c9f 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -827,6 +827,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) mutex_unlock(&priv->lock); if (use_ptemod) { + map->pages_vm_start = vma->vm_start; err = apply_to_page_range(vma->vm_mm, vma->vm_start, vma->vm_end - vma->vm_start, find_grant_ptes, map); @@ -864,7 +865,6 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) set_grant_ptes_as_special, NULL); } #endif - map->pages_vm_start = vma->vm_start; } return 0; |