diff options
| author | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
| commit | 957265bd4fe182af757886f117416d66f68854aa (patch) | |
| tree | 177cee182ea61611f0b80db704203bf72ee4f3cb /drivers/xen/gntdev.c | |
| parent | 60c98d9abbd1ff3274b904027690f3c33d656250 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into android-3.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 99d8151c824..1ffd03bf8e1 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -722,7 +722,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) vma->vm_flags |= VM_RESERVED|VM_DONTEXPAND; if (use_ptemod) - vma->vm_flags |= VM_DONTCOPY|VM_PFNMAP; + vma->vm_flags |= VM_DONTCOPY; vma->vm_private_data = map; |