diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 9bd82f7e71f4..7965b51b8cf0 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_malloc.c,v 1.146 2017/07/28 12:28:48 martin Exp $ */ +/* $NetBSD: kern_malloc.c,v 1.147 2018/08/20 11:46:44 maxv Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.146 2017/07/28 12:28:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.147 2018/08/20 11:46:44 maxv Exp $"); #include #include @@ -124,8 +124,9 @@ kern_malloc(unsigned long size, int flags) } mh = (void *)((char *)p + hdroffset); mh->mh_size = allocsize - hdroffset; + mh++; - return mh + 1; + return mh; } void diff --git a/sys/kern/subr_kmem.c b/sys/kern/subr_kmem.c index cc316244a107..3732e1d1e573 100644 --- a/sys/kern/subr_kmem.c +++ b/sys/kern/subr_kmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_kmem.c,v 1.67 2018/08/20 11:35:28 maxv Exp $ */ +/* $NetBSD: subr_kmem.c,v 1.68 2018/08/20 11:46:44 maxv Exp $ */ /*- * Copyright (c) 2009-2015 The NetBSD Foundation, Inc. @@ -92,7 +92,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.67 2018/08/20 11:35:28 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.68 2018/08/20 11:46:44 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_kmem.h" @@ -265,8 +265,9 @@ kmem_intr_alloc(size_t requested_size, km_flag_t kmflags) if (__predict_true(p != NULL)) { FREECHECK_OUT(&kmem_freecheck, p); kmem_size_set(p, requested_size); + p += SIZE_SIZE; - return p + SIZE_SIZE; + return p; } return p; }