From 8b9363d1b1f7bc40fb68261f7659dea5124f2821 Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Tue, 8 Aug 2000 16:04:21 +0000 Subject: Sync with Linux 2.4.0-test6-pre8 --- linux/i810_dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'linux/i810_dma.c') diff --git a/linux/i810_dma.c b/linux/i810_dma.c index f3d9db43..19b7bd92 100644 --- a/linux/i810_dma.c +++ b/linux/i810_dma.c @@ -282,8 +282,8 @@ static unsigned long i810_alloc_page(drm_device_t *dev) if(address == 0UL) return 0; - atomic_inc(&mem_map[MAP_NR((void *) address)].count); - set_bit(PG_locked, &mem_map[MAP_NR((void *) address)].flags); + atomic_inc(&virt_to_page(address)->count); + set_bit(PG_locked, &virt_to_page(address)->flags); return address; } @@ -293,9 +293,9 @@ static void i810_free_page(drm_device_t *dev, unsigned long page) if(page == 0UL) return; - atomic_dec(&mem_map[MAP_NR((void *) page)].count); - clear_bit(PG_locked, &mem_map[MAP_NR((void *) page)].flags); - wake_up(&mem_map[MAP_NR((void *) page)].wait); + atomic_dec(&virt_to_page(page)->count); + clear_bit(PG_locked, &virt_to_page(page)->flags); + wake_up(&virt_to_page(page)->wait); free_page(page); return; } -- cgit v1.2.3