From 9d7b01ebbe71ff6ca3ea421d5bff64f403b592ba Mon Sep 17 00:00:00 2001 From: Michel Daenzer Date: Fri, 15 Aug 2003 10:31:54 +0000 Subject: Merge from 2.6 kernel (Linus Torvalds) --- linux-core/drm_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux-core/drm_vm.c') 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 -- cgit v1.2.3