diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2001-09-25 09:32:16 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2001-09-25 09:32:16 +0000 |
| commit | ca820fca877faf4776be142417795a5945c606e6 (patch) | |
| tree | 3b43fba2476fcbd4f81fa26b400549ad1df766f7 /linux-core/drm_scatter.c | |
| parent | 390440c9399a3c01811f3b37c2628d6e905656e8 (diff) | |
merge with 2.4.10 kernel
Diffstat (limited to 'linux-core/drm_scatter.c')
| -rw-r--r-- | linux-core/drm_scatter.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linux-core/drm_scatter.c b/linux-core/drm_scatter.c index f0074450..a6b8275f 100644 --- a/linux-core/drm_scatter.c +++ b/linux-core/drm_scatter.c @@ -47,11 +47,9 @@ void DRM(sg_cleanup)( drm_sg_mem_t *entry ) vfree( entry->virtual ); -#if defined(__alpha__) DRM(free)( entry->busaddr, entry->pages * sizeof(*entry->busaddr), DRM_MEM_PAGES ); -#endif DRM(free)( entry->pagelist, entry->pages * sizeof(*entry->pagelist), DRM_MEM_PAGES ); @@ -99,7 +97,6 @@ int DRM(sg_alloc)( struct inode *inode, struct file *filp, return -ENOMEM; } -#if defined(__alpha__) entry->busaddr = DRM(alloc)( pages * sizeof(*entry->busaddr), DRM_MEM_PAGES ); if ( !entry->busaddr ) { @@ -112,15 +109,12 @@ int DRM(sg_alloc)( struct inode *inode, struct file *filp, return -ENOMEM; } memset( (void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr) ); -#endif entry->virtual = vmalloc_32( pages << PAGE_SHIFT ); if ( !entry->virtual ) { -#if defined(__alpha__) DRM(free)( entry->busaddr, entry->pages * sizeof(*entry->busaddr), DRM_MEM_PAGES ); -#endif DRM(free)( entry->pagelist, entry->pages * sizeof(*entry->pagelist), DRM_MEM_PAGES ); |