diff options
| author | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-13 23:23:47 +0000 |
|---|---|---|
| committer | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-13 23:23:47 +0000 |
| commit | aa09e3611490d6a2f12f211c3c834f1237126313 (patch) | |
| tree | 0938669d60d1697e119ed218f276aaa38830e29e /linux-core/drm_scatter.c | |
| parent | 2d4b2cf6f69de2ceaf0c2b00ccbb24aad412b202 (diff) | |
Sync with Linus 2.4.9-pre2 + make all nopage routines more alike
Diffstat (limited to 'linux-core/drm_scatter.c')
| -rw-r--r-- | linux-core/drm_scatter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_scatter.c b/linux-core/drm_scatter.c index 5654c8cb..66d34968 100644 --- a/linux-core/drm_scatter.c +++ b/linux-core/drm_scatter.c @@ -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++) { |