aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-08-20 07:33:07 +0000
committerDave Airlie <airlied@linux.ie>2005-08-20 07:33:07 +0000
commitd12768f79ac2dbf9e31a32107f6e5379cb9484e4 (patch)
tree3b77fb286ef3f0b429ba22238eef564329cf3f17
parent2e9bd9ac18e17e91bec4e3b777503a53a3faf952 (diff)
remove checks that make ppc64 not work properly... also fix ppc64 check..
we should be safe doing this..
-rw-r--r--linux-core/drm_vm.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index b253991f..b2d0bfb1 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -634,18 +634,17 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
/* fall through to _DRM_FRAME_BUFFER... */
case _DRM_FRAME_BUFFER:
case _DRM_REGISTERS:
- if (map->offset >= __pa(high_memory)) {
#if defined(__i386__) || defined(__x86_64__)
- if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
- pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
- pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
- }
+ if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
+ pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+ pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
+ }
#elif defined(__powerpc__)
- pgprot_val(vma->vm_page_prot) |=
- _PAGE_NO_CACHE | _PAGE_GUARDED;
+ pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
+ if (map->type == _DRM_REGISTERS)
+ pgprot_val(vma->vm_page_prot) |= _PAGE_GUARDED;
#endif
- vma->vm_flags |= VM_IO; /* not in core dump */
- }
+ vma->vm_flags |= VM_IO; /* not in core dump */
#if defined(__ia64__)
if (efi_range_is_wc(vma->vm_start, vma->vm_end -
vma->vm_start))