[src/trunk]: src/sys We don't support KMEM_GUARD nor FREECHECK yet with rump, ...

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

details:   https://anonhg.NetBSD.org/src/rev/31535620938c
branches:  trunk
changeset: 778839:31535620938c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 15 19:07:40 2012 +0000

description:
We don't support KMEM_GUARD nor FREECHECK yet with rump, so disable them
in debug builds of the rump kernel.

diffstat:

 sys/kern/subr_kmem.c |  6 +++---
 sys/sys/debug.h      |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r f5d0cc37a7f0 -r 31535620938c sys/kern/subr_kmem.c
--- a/sys/kern/subr_kmem.c      Sun Apr 15 18:10:13 2012 +0000
+++ b/sys/kern/subr_kmem.c      Sun Apr 15 19:07:40 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_kmem.c,v 1.44 2012/04/13 06:27:02 mrg Exp $       */
+/*     $NetBSD: subr_kmem.c,v 1.45 2012/04/15 19:07:40 martin Exp $    */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.44 2012/04/13 06:27:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.45 2012/04/15 19:07:40 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/callback.h>
@@ -121,7 +121,7 @@
 static pool_cache_t kmem_cache[KMEM_CACHE_COUNT] __cacheline_aligned;
 static size_t kmem_cache_maxidx __read_mostly;
 
-#if defined(DEBUG)
+#if defined(DEBUG) && defined(_HARDKERNEL)
 #ifndef KMEM_GUARD_DEPTH
 #define KMEM_GUARD_DEPTH 0
 #endif
diff -r f5d0cc37a7f0 -r 31535620938c sys/sys/debug.h
--- a/sys/sys/debug.h   Sun Apr 15 18:10:13 2012 +0000
+++ b/sys/sys/debug.h   Sun Apr 15 19:07:40 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: debug.h,v 1.3 2008/04/28 20:24:10 martin Exp $ */
+/*     $NetBSD: debug.h,v 1.4 2012/04/15 19:07:40 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 void   freecheck_out(void **, void *);
 void   freecheck_in(void **, void *);
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(_HARDKERNEL)
 #define        FREECHECK_OUT(h, a)     freecheck_out((h), (a))
 #define        FREECHECK_IN(h, a)      freecheck_in((h), (a))
 #else