aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_compat.c
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/drm_compat.c
parent4c03030b12bae28dad50d69bd271de632c43ff13 (diff)
Module protection map access is moving into mainline kernels.
Update drm_compat accordingly. (Reported by Dave Airlie)
Diffstat (limited to 'linux-core/drm_compat.c')
-rw-r--r--linux-core/drm_compat.c6
1 files changed, 3 insertions, 3 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
};