From 9eb66b4bab445febcc9a95fcd85b0deb02222f9c Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Sat, 1 Feb 1997 05:33:32 +0000
Subject: [PATCH] back out some of the previous change.  In particular, go back
 to #defining MALLOC/FREE to use malloc()/free() if DIAGNOSTIC (not DEBUG)
 since DIAGNOSTIC is what enables freelist consistency checking, and don't
 force the definition of KMEMSTATS if DEBUG is defined (there's no reason to,
 since users can do it themselves if they want it).

---
 sys/sys/malloc.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 926055ea99d6..ae49fe5c31e6 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: malloc.h,v 1.26 1997/01/30 22:07:44 tls Exp $	*/
+/*	$NetBSD: malloc.h,v 1.27 1997/02/01 05:33:32 cgd Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -38,10 +38,6 @@
 #ifndef _SYS_MALLOC_H_
 #define	_SYS_MALLOC_H_
 
-#ifdef DEBUG
-#define	KMEMSTATS
-#endif
-
 /*
  * flags to malloc
  */
@@ -295,7 +291,7 @@ struct kmembuckets {
 /*
  * Macro versions for the usual cases of malloc/free
  */
-#if defined(KMEMSTATS) || defined(DEBUG)
+#if defined(KMEMSTATS) || defined(DIAGNOSTIC)
 #define	MALLOC(space, cast, size, type, flags) \
 	(space) = (cast)malloc((u_long)(size), type, flags)
 #define	FREE(addr, type) free((caddr_t)(addr), type)