From 7586a655fc7d8e89a4fe37ec7926f4fbc13f358d Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Thu, 23 Jun 2005 05:29:16 +0000 Subject: Fix drm_memory_debug.c to compile, doesn't seem to be working Clean up error return path in drm_stub.c --- linux-core/drm_memory_debug.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'linux-core/drm_memory_debug.c') diff --git a/linux-core/drm_memory_debug.c b/linux-core/drm_memory_debug.c index 875fec05..2ce2abcd 100644 --- a/linux-core/drm_memory_debug.c +++ b/linux-core/drm_memory_debug.c @@ -374,7 +374,11 @@ DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type) return NULL; } +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11) if ((handle = drm_agp_allocate_memory(pages, type))) { +#else + if ((handle = drm_agp_allocate_memory(dev->agp->bridge, pages, type))) { +#endif spin_lock(&drm_mem_lock); ++drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count; drm_mem_stats[DRM_MEM_TOTALAGP].bytes_allocated @@ -387,6 +391,7 @@ DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type) spin_unlock(&drm_mem_lock); return NULL; } +EXPORT_SYMBOL(drm_alloc_agp); int drm_free_agp(DRM_AGP_MEM * handle, int pages) { @@ -416,6 +421,7 @@ int drm_free_agp(DRM_AGP_MEM * handle, int pages) } return retval; } +EXPORT_SYMBOL(drm_free_agp); int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start) { @@ -440,6 +446,7 @@ int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start) spin_unlock(&drm_mem_lock); return retcode; } +EXPORT_SYMBOL(drm_bind_agp); int drm_unbind_agp(DRM_AGP_MEM * handle) { @@ -468,6 +475,7 @@ int drm_unbind_agp(DRM_AGP_MEM * handle) } return retcode; } +EXPORT_SYMBOL(drm_unbind_agp); #endif #endif -- cgit v1.2.3