From aa09e3611490d6a2f12f211c3c834f1237126313 Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Mon, 13 Aug 2001 23:23:47 +0000 Subject: Sync with Linus 2.4.9-pre2 + make all nopage routines more alike --- linux/drm_scatter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drm_scatter.h') diff --git a/linux/drm_scatter.h b/linux/drm_scatter.h index 5654c8cb..66d34968 100644 --- a/linux/drm_scatter.h +++ b/linux/drm_scatter.h @@ -179,7 +179,7 @@ int DRM(sg_alloc)( struct inode *inode, struct file *filp, for ( i = 0 ; i < pages ; i++ ) { unsigned long *tmp; - tmp = (unsigned long *)entry->pagelist[i]->virtual; + tmp = page_address( entry->pagelist[i] ); for ( j = 0 ; j < PAGE_SIZE / sizeof(unsigned long) ; j++, tmp++ ) { @@ -197,7 +197,7 @@ int DRM(sg_alloc)( struct inode *inode, struct file *filp, "virtual mapping\n" ); } } - tmp = (unsigned long *)entry->pagelist[i]->virtual; + tmp = page_address( entry->pagelist[i] ); for(j = 0 ; j < PAGE_SIZE / sizeof(unsigned long) ; j++, tmp++) { -- cgit v1.2.3