diff options
| author | Hugh Dickins <hugh@veritas.com> | 2006-07-26 21:39:49 +0100 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-07-26 19:58:39 -0400 |
| commit | 804af2cf6e7af31d2e664b54e657dddd9b531dbd (patch) | |
| tree | a9127236c76953ddc627b8133aae208651e206fd /drivers/char | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
| download | linux-stable-804af2cf6e7af31d2e664b54e657dddd9b531dbd.tar.gz linux-stable-804af2cf6e7af31d2e664b54e657dddd9b531dbd.tar.bz2 linux-stable-804af2cf6e7af31d2e664b54e657dddd9b531dbd.zip | |
[AGPGART] remove private page protection map
AGP keeps its own copy of the protection_map, upcoming DRM changes will
also require access to this map from modules.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/frontend.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index d9c5a9142ad1..0f2ed2aa2d81 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c @@ -151,35 +151,12 @@ static void agp_add_seg_to_client(struct agp_client *client, client->segments = seg; } -/* Originally taken from linux/mm/mmap.c from the array - * protection_map. - * The original really should be exported to modules, or - * some routine which does the conversion for you - */ - -static const pgprot_t my_protect_map[16] = -{ - __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111, - __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111 -}; - static pgprot_t agp_convert_mmap_flags(int prot) { -#define _trans(x,bit1,bit2) \ -((bit1==bit2)?(x&bit1):(x&bit1)?bit2:0) - unsigned long prot_bits; - pgprot_t temp; - - prot_bits = _trans(prot, PROT_READ, VM_READ) | - _trans(prot, PROT_WRITE, VM_WRITE) | - _trans(prot, PROT_EXEC, VM_EXEC); - - prot_bits |= VM_SHARED; - temp = my_protect_map[prot_bits & 0x0000000f]; - - return temp; + prot_bits = calc_vm_prot_bits(prot) | VM_SHARED; + return vm_get_page_prot(prot_bits); } static int agp_create_segment(struct agp_client *client, struct agp_region *region) |