summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2003-05-17 00:37:34 +0000
committerMichel Daenzer <michel@daenzer.net>2003-05-17 00:37:34 +0000
commitb942999b5915cbad75f16f6c242bab03c33f0c8b (patch)
tree8a21a72a5ef9b220dba81578de1430c3a56caeab
parente5d3c7f260d18168eec755c73f01ac617390d96c (diff)
do allow reading from read only mappings...
-rw-r--r--linux-core/drm_vm.c2
-rw-r--r--linux/drm_vm.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index 59b19da3..f9c1e356 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -416,7 +416,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_MAYWRITE;
+ vma->vm_flags &= (VM_READ | VM_MAYREAD);
#if defined(__i386__) || defined(__x86_64__)
pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
#else
diff --git a/linux/drm_vm.h b/linux/drm_vm.h
index 59b19da3..f9c1e356 100644
--- a/linux/drm_vm.h
+++ b/linux/drm_vm.h
@@ -416,7 +416,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_MAYWRITE;
+ vma->vm_flags &= (VM_READ | VM_MAYREAD);
#if defined(__i386__) || defined(__x86_64__)
pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
#else