From b4722ec943b3c51e103aaf7c6c77fe7b9c2c716d Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Thu, 20 Jul 2000 05:17:49 +0000 Subject: More fixups for kernel build: EXPORT_SYMTAB warning removal put_module_symbol clean up of tdfx tdfx_cleanup routine Makefile.kernel fix --- linux-core/tdfx_drv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'linux-core/tdfx_drv.c') diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index b8e2ec30..97bd4180 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -31,7 +31,9 @@ */ #include +#ifndef EXPORT_SYMTAB #define EXPORT_SYMTAB +#endif #include "drmP.h" #include "tdfx_drv.h" EXPORT_SYMBOL(tdfx_init); @@ -241,9 +243,7 @@ static int tdfx_takedown(drm_device_t *dev) drm_free(temp, sizeof(*temp), DRM_MEM_AGPLISTS); temp = temp_next; } - if(dev->agp->acquired) (*drm_agp.release)(); - drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); - dev->agp = NULL; + if (dev->agp->acquired) (*drm_agp.release)(); } #endif /* Clear vma list (only built for debugging) */ @@ -368,6 +368,13 @@ void tdfx_cleanup(void) } drm_ctxbitmap_cleanup(dev); tdfx_takedown(dev); +#ifdef DRM_AGP + if (dev->agp) { + drm_agp_uninit(); + drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); + dev->agp = NULL; + } +#endif } int tdfx_version(struct inode *inode, struct file *filp, unsigned int cmd, -- cgit v1.2.3