From 38ed67196f4ba891568c5ff66e67ced341696eb9 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 15 Dec 2006 12:37:24 +0100
Subject: Remove the memory caches for fence objects and memory manager nodes,
 since the support for memory caches has gone from 2.6.20.

---
 linux-core/drmP.h | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'linux-core/drmP.h')

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index d02184c7..13f97eee 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -755,17 +755,6 @@ typedef struct drm_head {
 	struct class_device *dev_class;
 } drm_head_t;
 
-typedef struct drm_cache {
-
-	/*
-	 * Memory caches
-	 */
-
-	kmem_cache_t *mm;
-	kmem_cache_t *fence_object;
-} drm_cache_t;
-
-
 
 typedef struct drm_fence_driver{
 	int no_types;
@@ -1318,7 +1307,6 @@ extern int drm_put_head(drm_head_t * head);
 extern unsigned int drm_debug; /* 1 to enable debug output */
 extern unsigned int drm_cards_limit;
 extern drm_head_t **drm_heads;
-extern drm_cache_t drm_cache;
 extern struct drm_sysfs_class *drm_class;
 extern struct proc_dir_entry *drm_proc_root;
 
@@ -1581,25 +1569,6 @@ static inline void drm_ctl_free(void *pt, size_t size, int area)
 	drm_free_memctl(size);
 }
 
-static inline void *drm_ctl_cache_alloc(kmem_cache_t *cache, size_t size, 
-					int flags)
-{
-	void *ret;
-	if (drm_alloc_memctl(size))
-		return NULL;
-	ret = kmem_cache_alloc(cache, flags);
-	if (!ret)
-		drm_free_memctl(size);
-	return ret;
-}
-
-static inline void drm_ctl_cache_free(kmem_cache_t *cache, size_t size,
-				      void *obj)
-{
-	kmem_cache_free(cache, obj);
-	drm_free_memctl(size);
-}
-
 /*@}*/
 
 #endif				/* __KERNEL__ */
-- 
cgit v1.2.3