From cf259f10aa8dbd83a4c086963fee7138280a9688 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Sat, 6 Nov 2004 02:00:04 +0000
Subject: Remove the vestiges of the memory-debug code.

---
 bsd-core/drm_memory.c     | 5 -----
 bsd-core/drm_os_freebsd.h | 9 ---------
 bsd-core/drm_os_netbsd.h  | 3 ---
 bsd-core/drm_sysctl.c     | 3 ---
 4 files changed, 20 deletions(-)

diff --git a/bsd-core/drm_memory.c b/bsd-core/drm_memory.c
index 63d9275f..dee3530c 100644
--- a/bsd-core/drm_memory.c
+++ b/bsd-core/drm_memory.c
@@ -38,9 +38,6 @@ MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures");
 #undef malloctype
 #endif
 
-#ifdef DEBUG_MEMORY
-#include "drm_memory_debug.h"
-#else
 void drm_mem_init(void)
 {
 #ifdef __NetBSD__
@@ -178,5 +175,3 @@ drm_mtrr_del(unsigned long offset, size_t size, int flags)
 	return mtrr_set(&mtrrmap, &one, NULL, MTRR_GETSET_KERNEL);
 }
 #endif
-
-#endif /* DEBUG_MEMORY */
diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index 83542d8a..ac72a7ae 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -411,10 +411,6 @@ find_first_zero_bit(volatile void *p, int max)
 	printf("error: [" DRM_NAME ":pid%d:%s] *ERROR* " fmt,		\
 	    DRM_CURRENTPID, __func__ , ## arg)
 
-#define DRM_MEM_ERROR(area, fmt, arg...) \
-	printf("error: [" DRM_NAME ":pid%d:%s:%s] *ERROR* " fmt,	\
-	    DRM_CURRENTPID , __func__, drm_mem_stats[area].name , ##arg)
-
 #define DRM_INFO(fmt, arg...)  printf("info: [" DRM_NAME "] " fmt , ## arg)
 
 #if DRM_DEBUG_CODE
@@ -451,8 +447,3 @@ extern drm_file_t	*drm_find_file_by_proc(drm_device_t *dev,
 /* sysctl support (drm_sysctl.h) */
 extern int		drm_sysctl_init(drm_device_t *dev);
 extern int		drm_sysctl_cleanup(drm_device_t *dev);
-
-/* Memory info sysctl (drm_memory_debug.h) */
-#ifdef DEBUG_MEMORY
-extern int		drm_mem_info DRM_SYSCTL_HANDLER_ARGS;
-#endif
diff --git a/bsd-core/drm_os_netbsd.h b/bsd-core/drm_os_netbsd.h
index d6db0103..7e1392c3 100644
--- a/bsd-core/drm_os_netbsd.h
+++ b/bsd-core/drm_os_netbsd.h
@@ -337,9 +337,6 @@ do { \
 	printf( fmt,## arg ); \
 } while (0)
 
-#define DRM_MEM_ERROR(area, fmt, arg...) \
-	printf("error: [" DRM_NAME ":%s:%s] *ERROR* " fmt , \
-		__func__, drm_mem_stats[area].name ,## arg)
 #define DRM_INFO(fmt, arg...)  printf("info: " "[" DRM_NAME "] " fmt ,## arg)
 
 #if DRM_DEBUG_CODE
diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c
index 41ffcf10..085fb1f5 100644
--- a/bsd-core/drm_sysctl.c
+++ b/bsd-core/drm_sysctl.c
@@ -39,9 +39,6 @@ struct drm_sysctl_list {
 	int	   (*f) DRM_SYSCTL_HANDLER_ARGS;
 } drm_sysctl_list[] = {
 	{"name",    drm_name_info},
-#ifdef DEBUG_MEMORY
-	{"mem",     drm_mem_info},
-#endif
 	{"vm",	    drm_vm_info},
 	{"clients", drm_clients_info},
 	{"bufs",    drm_bufs_info},
-- 
cgit v1.2.3