summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>1999-05-27 23:52:04 +0000
committerArtur Grabowski <art@cvs.openbsd.org>1999-05-27 23:52:04 +0000
commitc4b0ed3bdc0a2ca20062d67965684276b69f1089 (patch)
tree8c43abc9a45058a99cccee2efb2f5f55240eb1a4 /sys
parentf7958869bff693f5e798131f089ff0eb2882b1c8 (diff)
remove the NO_KMEMSTATS hack from sys/malloc.h
add KMEMSTATS to GENERIC to keep old behavior
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/GENERIC3
-rw-r--r--sys/sys/malloc.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 7abaf692ccb..324af7f2504 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.48 1999/04/20 22:35:30 provos Exp $
+# $OpenBSD: GENERIC,v 1.49 1999/05/27 23:52:03 art Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -16,6 +16,7 @@ option DDB # in-kernel debugger
#makeoptions DEBUG="-g" # compile full symbol table
option DIAGNOSTIC # internal consistency checks
option KTRACE # system call tracing, a la ktrace(1)
+option KMEMSTATS # collect malloc(9) statistics
option SYSVMSG # System V-like message queues
option SYSVSEM # System V-like semaphores
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index b3f24afd8cd..6638bc9b953 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc.h,v 1.21 1999/02/26 01:57:58 art Exp $ */
+/* $OpenBSD: malloc.h,v 1.22 1999/05/27 23:52:03 art Exp $ */
/* $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $ */
/*
@@ -39,10 +39,6 @@
#ifndef _SYS_MALLOC_H_
#define _SYS_MALLOC_H_
-#ifndef NO_KMEMSTATS
-#define KMEMSTATS
-#endif
-
/*
* flags to malloc
*/