Module Name: src
Committed By: riastradh
Date: Sat Jun 13 18:38:33 UTC 2020
Modified Files:
src/sys/dev: cgd.c cgd_crypto.c cgdvar.h
Log Message:
Tidy up includes.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/cgd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cgd_crypto.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/cgdvar.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/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.128 src/sys/dev/cgd.c:1.129
--- src/sys/dev/cgd.c:1.128 Sat Jun 13 18:36:07 2020
+++ src/sys/dev/cgd.c Sat Jun 13 18:38:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.128 2020/06/13 18:36:07 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.129 2020/06/13 18:38:33 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,32 +30,33 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.128 2020/06/13 18:36:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.129 2020/06/13 18:38:33 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/errno.h>
#include <sys/buf.h>
#include <sys/bufq.h>
-#include <sys/kmem.h>
-#include <sys/module.h>
-#include <sys/pool.h>
-#include <sys/ioctl.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
+#include <sys/errno.h>
#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/kmem.h>
+#include <sys/module.h>
#include <sys/namei.h> /* for pathbuf */
-#include <sys/vnode.h>
-#include <sys/conf.h>
+#include <sys/pool.h>
+#include <sys/proc.h>
#include <sys/syslog.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
#include <sys/workqueue.h>
-#include <sys/cpu.h>
-#include <dev/dkvar.h>
+#include <dev/cgd_crypto.h>
#include <dev/cgdvar.h>
+#include <dev/dkvar.h>
#include <miscfs/specfs/specdev.h> /* for v_rdev */
Index: src/sys/dev/cgd_crypto.c
diff -u src/sys/dev/cgd_crypto.c:1.18 src/sys/dev/cgd_crypto.c:1.19
--- src/sys/dev/cgd_crypto.c:1.18 Sat Jun 13 18:35:35 2020
+++ src/sys/dev/cgd_crypto.c Sat Jun 13 18:38:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd_crypto.c,v 1.18 2020/06/13 18:35:35 riastradh Exp $ */
+/* $NetBSD: cgd_crypto.c,v 1.19 2020/06/13 18:38:33 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,17 +37,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.18 2020/06/13 18:35:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.19 2020/06/13 18:38:33 riastradh Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/malloc.h>
+#include <sys/systm.h>
#include <dev/cgd_crypto.h>
-#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/des/des.h>
#include <crypto/blowfish/blowfish.h>
+#include <crypto/des/des.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
/*
* The general framework provides only one generic function.
Index: src/sys/dev/cgdvar.h
diff -u src/sys/dev/cgdvar.h:1.19 src/sys/dev/cgdvar.h:1.20
--- src/sys/dev/cgdvar.h:1.19 Mon Mar 9 08:33:15 2020
+++ src/sys/dev/cgdvar.h Sat Jun 13 18:38:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.19 2020/03/09 08:33:15 mlelstv Exp $ */
+/* $NetBSD: cgdvar.h,v 1.20 2020/06/13 18:38:33 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,6 +66,7 @@ struct cgd_user {
#ifdef _KERNEL
#include <dev/cgd_crypto.h>
+#include <dev/dkvar.h>
/* This cryptdata structure is here rather than cgd_crypto.h, since
* it stores local state which will not be generalised beyond the
