Module Name: src Committed By: martin Date: Sun Apr 15 19:07:40 UTC 2012
Modified Files: src/sys/kern: subr_kmem.c src/sys/sys: debug.h Log Message: We don't support KMEM_GUARD nor FREECHECK yet with rump, so disable them in debug builds of the rump kernel. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/subr_kmem.c cvs rdiff -u -r1.3 -r1.4 src/sys/sys/debug.h 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/subr_kmem.c diff -u src/sys/kern/subr_kmem.c:1.44 src/sys/kern/subr_kmem.c:1.45 --- src/sys/kern/subr_kmem.c:1.44 Fri Apr 13 06:27:02 2012 +++ src/sys/kern/subr_kmem.c Sun Apr 15 19:07:40 2012 @@ -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 const struct kmem_cache_info { 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 Index: src/sys/sys/debug.h diff -u src/sys/sys/debug.h:1.3 src/sys/sys/debug.h:1.4 --- src/sys/sys/debug.h:1.3 Mon Apr 28 20:24:10 2008 +++ src/sys/sys/debug.h Sun Apr 15 19:07:40 2012 @@ -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 debug_init(void); 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