diff options
author | Jeff Hartmann <jhartmann@valinux.com> | 2000-04-04 22:08:14 +0000 |
---|---|---|
committer | Jeff Hartmann <jhartmann@valinux.com> | 2000-04-04 22:08:14 +0000 |
commit | ba1b1ae3806490cce16a9c8957b52cd74967f463 (patch) | |
tree | ec80e9e61fac3a0f1a0eafaedef239c419a89403 /linux/vm.c | |
parent | 7d715d1800031ccbd37db7f88896464c0e838f10 (diff) |
Merged mga branch with trunkmga-0-0-2-20000404-merge
Diffstat (limited to 'linux/vm.c')
-rw-r--r-- | linux/vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -250,9 +250,10 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma) switch (map->type) { case _DRM_FRAME_BUFFER: case _DRM_REGISTERS: + case _DRM_AGP: if (VM_OFFSET(vma) >= __pa(high_memory)) { #if defined(__i386__) - if (boot_cpu_data.x86 > 3) { + 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; } |