[src/netbsd-6-0]: src/sys/kern Pull up following revision(s) (requested by pa...

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

details:   https://anonhg.NetBSD.org/src/rev/dbce289db376
branches:  netbsd-6-0
changeset: 774795:dbce289db376
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 20 10:16:31 2013 +0000

description:
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.

diffstat:

 sys/kern/subr_kmem.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r b3604f325c13 -r dbce289db376 sys/kern/subr_kmem.c
--- a/sys/kern/subr_kmem.c      Sat Apr 20 10:13:56 2013 +0000
+++ b/sys/kern/subr_kmem.c      Sat Apr 20 10:16:31 2013 +0000
@@ -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.2.4.1 2013/04/20 10:16:31 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.2.4.1 2013/04/20 10:16:31 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/callback.h>
@@ -223,8 +223,10 @@
                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;
 }
 
 /*