From 5647dd97282d9f70704d5ff6c4512c8821a36c5b Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 17 Nov 2009 14:08:54 -0800 Subject: [PATCH] --- yaml --- r: 168873 b: refs/heads/master c: 79cc304f3e2fda202242036326afb2aeca486156 h: refs/heads/master i: 168871: 2b44c84ec34b0e29a8f5741ce6c4209a601cb53c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb0c1e72927b..0650b9493b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f82f5f3ac4de6c6b872fcbb3dec97f368e78ff58 +refs/heads/master: 79cc304f3e2fda202242036326afb2aeca486156 diff --git a/trunk/drivers/gpu/drm/drm_gem.c b/trunk/drivers/gpu/drm/drm_gem.c index 80391995bdec..e9dbb481c469 100644 --- a/trunk/drivers/gpu/drm/drm_gem.c +++ b/trunk/drivers/gpu/drm/drm_gem.c @@ -552,7 +552,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND; vma->vm_ops = obj->dev->driver->gem_vm_ops; vma->vm_private_data = map->handle; - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); + vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); /* Take a ref for this mapping of the object, so that the fault * handler can dereference the mmap offset's pointer to the object.