summaryrefslogtreecommitdiff
path: root/linux-core/drm_vm.c
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2003-08-15 10:31:54 +0000
committerMichel Daenzer <michel@daenzer.net>2003-08-15 10:31:54 +0000
commit9d7b01ebbe71ff6ca3ea421d5bff64f403b592ba (patch)
tree8f5d66868305facceb7d0ecdde93c5569c8b5a53 /linux-core/drm_vm.c
parenta073ff7dc73dc98e81e2ae26e8c500ea7141084b (diff)
Merge from 2.6 kernel (Linus Torvalds)
Diffstat (limited to 'linux-core/drm_vm.c')
-rw-r--r--linux-core/drm_vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index c1dfb377..29cad56d 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -510,7 +510,7 @@ int DRM(mmap)(struct file *filp, struct vm_area_struct *vma)
if (map->size != vma->vm_end - vma->vm_start) return -EINVAL;
if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
- vma->vm_flags &= (VM_READ | VM_MAYREAD);
+ vma->vm_flags &= ~(VM_WRITE | VM_MAYWRITE);
#if defined(__i386__) || defined(__x86_64__)
pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
#else