Module Name: src
Committed By: maxv
Date: Mon Aug 20 11:46:44 UTC 2018
Modified Files:
src/sys/kern: kern_malloc.c subr_kmem.c
Log Message:
Compute the pointer earlier, not in the return statement. No functional
change.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.67 -r1.68 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/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.146 src/sys/kern/kern_malloc.c:1.147
--- src/sys/kern/kern_malloc.c:1.146 Fri Jul 28 12:28:48 2017
+++ src/sys/kern/kern_malloc.c Mon Aug 20 11:46:44 2018
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/malloc.h>
@@ -124,8 +124,9 @@ kern_malloc(unsigned long size, int flag
}
mh = (void *)((char *)p + hdroffset);
mh->mh_size = allocsize - hdroffset;
+ mh++;
- return mh + 1;
+ return mh;
}
void
Index: src/sys/kern/subr_kmem.c
diff -u src/sys/kern/subr_kmem.c:1.67 src/sys/kern/subr_kmem.c:1.68
--- src/sys/kern/subr_kmem.c:1.67 Mon Aug 20 11:35:28 2018
+++ src/sys/kern/subr_kmem.c Mon Aug 20 11:46:44 2018
@@ -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 <sys/cdefs.h>
-__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, k
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;
}
