[src/trunk]: src/sys Sort includes, nix trailing whitespace, fix comment.

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

details:   https://anonhg.NetBSD.org/src/rev/76a7325ea77d
branches:  trunk
changeset: 943135:76a7325ea77d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Aug 27 14:11:57 2020 +0000

description:
Sort includes, nix trailing whitespace, fix comment.

diffstat:

 sys/kern/kern_sysctl.c                      |  24 ++++++++++++++----------
 sys/rump/librump/rumpkern/Makefile.rumpkern |  12 ++++++------
 sys/sys/systm.h                             |   4 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diffs (123 lines):

diff -r 82e93f7ed417 -r 76a7325ea77d sys/kern/kern_sysctl.c
--- a/sys/kern/kern_sysctl.c    Thu Aug 27 14:01:36 2020 +0000
+++ b/sys/kern/kern_sysctl.c    Thu Aug 27 14:11:57 2020 +0000
@@ -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 @@
 #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/rndsource.h>
 #include <sys/syscallargs.h>
-#include <sys/kauth.h>
-#include <sys/ktrace.h>
-#include <sys/rndsource.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
 
 #include <crypto/blake2/blake2s.h>
 
@@ -2827,13 +2830,14 @@
 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);
diff -r 82e93f7ed417 -r 76a7325ea77d sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Thu Aug 27 14:01:36 2020 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Thu Aug 27 14:11:57 2020 +0000
@@ -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 @@
        ${RUMPTOP}/../uvm                                       \
        ${RUMPTOP}/../conf                                      \
        ${RUMPTOP}/../dev                                       \
+       ${RUMPTOP}/../crypto/blake2                             \
+       ${RUMPTOP}/../crypto/chacha                             \
+       ${RUMPTOP}/../crypto/cprng_fast                         \
        ${RUMPTOP}/../crypto/nist_hash_drbg                     \
-       ${RUMPTOP}/../crypto/blake2                             \
-       ${RUMPTOP}/../crypto/cprng_fast                         \
-       ${RUMPTOP}/../crypto/chacha                             \
        ${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 @@
 # 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
diff -r 82e93f7ed417 -r 76a7325ea77d sys/sys/systm.h
--- a/sys/sys/systm.h   Thu Aug 27 14:01:36 2020 +0000
+++ b/sys/sys/systm.h   Thu Aug 27 14:11:57 2020 +0000
@@ -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 @@
                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 *);