Missed files in the last commit: Remove memory debugging sysctl unless

    MEMORY_DEBUG is set.

diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index acbd7cf..8331d24 100644 (file)
--- 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 1cf794c..8c038bd 100644 (file)
--- 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 acbd7cf..8331d24 100644 (file)
--- 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 1cf794c..8c038bd 100644 (file)
--- 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)    },