Module Name: src
Committed By: bouyer
Date: Sat Apr 20 10:17:55 UTC 2013
Modified Files:
src/sys/kern [netbsd-6]: subr_kmem.c
Log Message:
Pull up following revision(s) (requested by para in ticket #876):
sys/kern/subr_kmem.c: revision 1.47
addresses PR/47512
properly return NULL for failed allocations not 0x8 with size checks
enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.42.2.2 -r1.42.2.3 src/sys/kern/subr_kmem.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/subr_kmem.c
diff -u src/sys/kern/subr_kmem.c:1.42.2.2 src/sys/kern/subr_kmem.c:1.42.2.3
--- src/sys/kern/subr_kmem.c:1.42.2.2 Sun Aug 12 14:45:31 2012
+++ src/sys/kern/subr_kmem.c Sat Apr 20 10:17:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kmem.c,v 1.42.2.2 2012/08/12 14:45:31 martin Exp $ */
+/* $NetBSD: subr_kmem.c,v 1.42.2.3 2013/04/20 10:17:55 bouyer 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.42.2.2 2012/08/12 14:45:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.42.2.3 2013/04/20 10:17:55 bouyer Exp $");
#include <sys/param.h>
#include <sys/callback.h>
@@ -223,8 +223,10 @@ kmem_intr_alloc(size_t size, km_flag_t k
kmem_poison_check(p, size);
FREECHECK_OUT(&kmem_freecheck, p);
kmem_size_set(p, size);
+
+ return p + SIZE_SIZE;
}
- return p + SIZE_SIZE;
+ return p;
}
/*
