Module Name: src
Committed By: riastradh
Date: Thu Aug 27 14:11:57 UTC 2020
Modified Files:
src/sys/kern: kern_sysctl.c
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/sys/sys: systm.h
Log Message:
Sort includes, nix trailing whitespace, fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.186 -r1.187 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.296 -r1.297 src/sys/sys/systm.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/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.265 src/sys/kern/kern_sysctl.c:1.266
--- src/sys/kern/kern_sysctl.c:1.265 Thu Aug 27 14:01:36 2020
+++ src/sys/kern/kern_sysctl.c Thu Aug 27 14:11:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.265 2020/08/27 14:01:36 riastradh Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.266 2020/08/27 14:11:57 riastradh Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,8 +67,10 @@
* sysctl system call.
*/
+#define __COMPAT_SYSCTL
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.265 2020/08/27 14:01:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.266 2020/08/27 14:11:57 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
@@ -77,19 +79,20 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sysctl.
#include "ksyms.h"
#include <sys/param.h>
-#define __COMPAT_SYSCTL
-#include <sys/sysctl.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
#include <sys/buf.h>
+#include <sys/cprng.h>
+#include <sys/kauth.h>
#include <sys/ksyms.h>
+#include <sys/ktrace.h>
#include <sys/malloc.h>
#include <sys/mount.h>
-#include <sys/cprng.h>
#include <sys/once.h>
-#include <sys/syscallargs.h>
-#include <sys/kauth.h>
-#include <sys/ktrace.h>
#include <sys/rndsource.h>
+#include <sys/syscallargs.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
#include <crypto/blake2/blake2s.h>
@@ -2827,13 +2830,14 @@ static ONCE_DECL(random_inithook);
static int
random_address_init(void)
{
+
cprng_strong(kern_cprng, address_key, sizeof(address_key), 0);
return 0;
}
void
hash_value(void *d, size_t ds, const void *s, size_t ss)
-{
+{
RUN_ONCE(&random_inithook, random_address_init);
blake2s(d, ds, address_key, sizeof(address_key), s, ss);
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.186 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.187
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.186 Thu Aug 27 14:01:36 2020
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Aug 27 14:11:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.186 2020/08/27 14:01:36 riastradh Exp $
+# $NetBSD: Makefile.rumpkern,v 1.187 2020/08/27 14:11:57 riastradh Exp $
#
IOCONFDIR:= ${.PARSEDIR}
@@ -15,17 +15,17 @@ MAN= rump.3 rump_lwproc.3
${RUMPTOP}/../uvm \
${RUMPTOP}/../conf \
${RUMPTOP}/../dev \
- ${RUMPTOP}/../crypto/nist_hash_drbg \
${RUMPTOP}/../crypto/blake2 \
- ${RUMPTOP}/../crypto/cprng_fast \
${RUMPTOP}/../crypto/chacha \
+ ${RUMPTOP}/../crypto/cprng_fast \
+ ${RUMPTOP}/../crypto/nist_hash_drbg \
${RUMPTOP}/../secmodel \
${RUMPTOP}/../secmodel/suser \
${RUMPTOP}/../compat/common
#
# Source modules, first the ones specifically implemented for librump.
-#
+#
SRCS+= rump.c rumpcopy.c cons.c emul.c etfs_wrap.c intr.c \
lwproc.c klock.c kobj_rename.c ltsleep.c scheduler.c \
signals.c sleepq.c threads.c vm.c hyperentropy.c \
@@ -154,7 +154,7 @@ SRCS+= vnode_if.c
# sys/dev
SRCS+= clock_subr.c
-# sys/dev/crypto
+# sys/crypto
# Note: these are here only for cprng. More crypto algos for drivers
# are available from the rumpkern_crypto component
SRCS+= nist_hash_drbg.c
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.296 src/sys/sys/systm.h:1.297
--- src/sys/sys/systm.h:1.296 Wed Aug 26 22:56:55 2020
+++ src/sys/sys/systm.h Thu Aug 27 14:11:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.296 2020/08/26 22:56:55 christos Exp $ */
+/* $NetBSD: systm.h,v 1.297 2020/08/27 14:11:57 riastradh Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -225,7 +225,7 @@ enum hashtype {
else \
hash_value(&dst, sizeof(dst), &__v, sizeof(__v)); \
} while (/*CONSTCOND*/0)
-
+
void hash_value(void *, size_t, const void *, size_t);
bool get_expose_address(struct proc *);
void *hashinit(u_int, enum hashtype, bool, u_long *);
