Module Name: src
Committed By: bouyer
Date: Sun Feb 14 13:37:42 UTC 2010
Modified Files:
src/sys/kern [netbsd-5]: kern_malloc.c
Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1292):
sys/kern/kern_malloc.c: revision 1.128
Let kernel build when MALLOCLOG is defined but DIAGNOSTIC is not.
Else, hitmlog() is defined but not used, which triggers a warning.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.121.4.1 src/sys/kern/kern_malloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.121 src/sys/kern/kern_malloc.c:1.121.4.1
--- src/sys/kern/kern_malloc.c:1.121 Sun Oct 26 12:23:28 2008
+++ src/sys/kern/kern_malloc.c Sun Feb 14 13:37:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.121 2008/10/26 12:23:28 blymn Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.121.4.1 2010/02/14 13:37:42 bouyer Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.121 2008/10/26 12:23:28 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.121.4.1 2010/02/14 13:37:42 bouyer Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -215,6 +215,7 @@
malloclogptr = 0;
}
+#ifdef DIAGNOSTIC
static void
hitmlog(void *a)
{
@@ -271,6 +272,7 @@
#undef PRT
}
+#endif /* DIAGNOSTIC */
#endif /* MALLOCLOG */
#ifdef DIAGNOSTIC
