summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2003-04-26 22:21:37 +0000
committerEric Anholt <anholt@freebsd.org>2003-04-26 22:21:37 +0000
commita79adaab72bde726ce4c08184997f34b31014d9e (patch)
tree94946adc5d1687651450ced7d2b8437501560810
parent8621ae310b496a5d5db10236083f3f3d38362719 (diff)
downloaddrm-a79adaab72bde726ce4c08184997f34b31014d9e.tar.gz
Missed files in the last commit: Remove memory debugging sysctl unless
MEMORY_DEBUG is set.
-rw-r--r--bsd-core/drm_os_freebsd.h4
-rw-r--r--bsd-core/drm_sysctl.c2
-rw-r--r--bsd/drm_os_freebsd.h4
-rw-r--r--bsd/drm_sysctl.h2
4 files changed, 10 insertions, 2 deletions
diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index acbd7cf3..8331d246 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -398,5 +398,7 @@ extern drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev,
extern int DRM(sysctl_init)(drm_device_t *dev);
extern int DRM(sysctl_cleanup)(drm_device_t *dev);
-/* Memory info sysctl (drm_memory.h) */
+/* 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_sysctl.c b/bsd-core/drm_sysctl.c
index 1cf794c0..8c038bdd 100644
--- a/bsd-core/drm_sysctl.c
+++ b/bsd-core/drm_sysctl.c
@@ -16,7 +16,9 @@ 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) },
diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h
index acbd7cf3..8331d246 100644
--- a/bsd/drm_os_freebsd.h
+++ b/bsd/drm_os_freebsd.h
@@ -398,5 +398,7 @@ extern drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev,
extern int DRM(sysctl_init)(drm_device_t *dev);
extern int DRM(sysctl_cleanup)(drm_device_t *dev);
-/* Memory info sysctl (drm_memory.h) */
+/* Memory info sysctl (drm_memory_debug.h) */
+#ifdef DEBUG_MEMORY
extern int DRM(mem_info) DRM_SYSCTL_HANDLER_ARGS;
+#endif
diff --git a/bsd/drm_sysctl.h b/bsd/drm_sysctl.h
index 1cf794c0..8c038bdd 100644
--- a/bsd/drm_sysctl.h
+++ b/bsd/drm_sysctl.h
@@ -16,7 +16,9 @@ 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) },