[src/netbsd-1-5]: src/sys/sys Pull up rev. 1.52-1.53:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bd80f7b0ea06
branches:  netbsd-1-5
changeset: 488252:bd80f7b0ea06
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jun 24 23:53:09 2000 +0000

description:
Pull up rev. 1.52-1.53:
Don't inline malloc/free if LOCKDEBUG is on.

diffstat:

 sys/sys/malloc.h |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 1351fa9f1ae3 -r bd80f7b0ea06 sys/sys/malloc.h
--- a/sys/sys/malloc.h  Sat Jun 24 23:49:43 2000 +0000
+++ b/sys/sys/malloc.h  Sat Jun 24 23:53:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: malloc.h,v 1.51 2000/06/03 18:22:38 matt Exp $ */
+/*     $NetBSD: malloc.h,v 1.51.2.1 2000/06/24 23:53:09 thorpej Exp $  */
 
 /*
  * Copyright (c) 1987, 1993
@@ -41,6 +41,7 @@
 #if defined(_KERNEL) && !defined(_LKM)
 #include "opt_kmemstats.h"
 #include "opt_malloclog.h"
+#include "opt_lockdebug.h"
 #endif
 
 /*
@@ -378,7 +379,7 @@
  * Macro versions for the usual cases of malloc/free
  */
 #if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(_LKM) || \
-    defined(MALLOCLOG)
+    defined(MALLOCLOG) || defined(LOCKDEBUG)
 #define        MALLOC(space, cast, size, type, flags) \
        (space) = (cast)malloc((u_long)(size), type, flags)
 #define        FREE(addr, type) free((caddr_t)(addr), type)