From 3624e43282b0c6aad32829f116fd8f7bce66fbb6 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 20 Oct 2006 15:06:31 +0200
Subject: Bug #8707, 2.6.19-rc compatibility for memory manager code.

---
 linux-core/drm_drv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_drv.c')

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 75c89c1c..518e2aa3 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -433,7 +433,7 @@ void drm_exit(struct drm_driver *driver)
 		}
 	} else
 		pci_unregister_driver(&driver->pci_driver);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))
 	free_nopage_retry();
 #endif
 	DRM_INFO("Module unloaded\n");
@@ -472,10 +472,14 @@ static void drm_free_mem_cache(kmem_cache_t *cache,
 {
 	if (!cache)
 		return;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
 	if (kmem_cache_destroy(cache)) {
 		DRM_ERROR("Warning! DRM is leaking %s memory.\n",
 			  name);
 	}
+#else
+	kmem_cache_destroy(cache);
+#endif
 }
 
 static void drm_free_memory_caches(void )
-- 
cgit v1.2.3