summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-08-25 18:14:22 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-08-25 18:14:22 +0200
commit1d3cf107d20cb11ad07667622785ef8341ab9c2a (patch)
treeeb76bc874f7f077495799a527d6c9db0a5fa9387 /linux-core
parent4c03030b12bae28dad50d69bd271de632c43ff13 (diff)
Module protection map access is moving into mainline kernels.
Update drm_compat accordingly. (Reported by Dave Airlie)
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_compat.c6
-rw-r--r--linux-core/drm_compat.h2
-rw-r--r--linux-core/drm_vm.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c
index cdef4b97..86bae306 100644
--- a/linux-core/drm_compat.c
+++ b/linux-core/drm_compat.c
@@ -124,7 +124,7 @@ void drm_clear_vma(struct vm_area_struct *vma,
#endif
}
-pgprot_t drm_prot_map(uint32_t flags)
+pgprot_t vm_get_page_prot(unsigned long vm_flags)
{
#ifdef MODULE
static pgprot_t drm_protection_map[16] = {
@@ -132,9 +132,9 @@ pgprot_t drm_prot_map(uint32_t flags)
__S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
};
- return drm_protection_map[flags & 0x0F];
+ return drm_protection_map[vm_flags & 0x0F];
#else
extern pgprot_t protection_map[];
- return protection_map[flags & 0x0F];
+ return protection_map[vm_flags & 0x0F];
#endif
};
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 80928319..779a7000 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -243,6 +243,6 @@ extern void drm_clear_vma(struct vm_area_struct *vma,
* flags. This is a functional interface to the kernel's protection map.
*/
-extern pgprot_t drm_prot_map(uint32_t flags);
+extern pgprot_t vm_get_page_prot(unsigned long vm_flags);
#endif
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index 9c2fbe08..b5003c97 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -48,7 +48,7 @@ static void drm_vm_ttm_open_wrapper(struct vm_area_struct *vma);
pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
{
- pgprot_t tmp = drm_prot_map(vma->vm_flags);
+ pgprot_t tmp = vm_get_page_prot(vma->vm_flags);
#if defined(__i386__) || defined(__x86_64__)
if (boot_cpu_data.x86 > 3 && map_type != _DRM_AGP) {
@@ -276,7 +276,7 @@ static __inline__ struct page *drm_do_vm_ttm_nopage(struct vm_area_struct *vma,
get_page(page);
- default_prot = drm_prot_map(vma->vm_flags);
+ default_prot = vm_get_page_prot(vma->vm_flags);
BUG_ON(page_flags & DRM_TTM_PAGE_UNCACHED);
vma->vm_page_prot = default_prot;