Module Name: src
Committed By: pgoyette
Date: Fri Apr 1 21:09:24 UTC 2022
Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/dev: cgd.c
src/sys/modules: Makefile
Added Files:
src/sys/modules/adiantum: Makefile
Log Message:
Create a loaable adiantum module, and make cgd require it.
This enablees use of a loadable cgd module, rather thtan requiring
it to be built-in.
Partially resolves kern/56772
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/cgd.c
cvs rdiff -u -r1.263 -r1.264 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/adiantum/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.17 src/distrib/sets/lists/debug/module.mi:1.18
--- src/distrib/sets/lists/debug/module.mi:1.17 Fri Apr 1 15:49:11 2022
+++ src/distrib/sets/lists/debug/module.mi Fri Apr 1 21:09:24 2022
@@ -1,9 +1,11 @@
-# $NetBSD: module.mi,v 1.17 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: module.mi,v 1.18 2022/04/01 21:09:24 pgoyette Exp $
./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_httpready modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_httpready/accf_httpready.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/adiantum modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/adiantum/adiantum.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/adosfs modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/adosfs/adosfs.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/aio modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.151 src/distrib/sets/lists/modules/mi:1.152
--- src/distrib/sets/lists/modules/mi:1.151 Fri Apr 1 15:49:11 2022
+++ src/distrib/sets/lists/modules/mi Fri Apr 1 21:09:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.151 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: mi,v 1.152 2022/04/01 21:09:24 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -11,6 +11,8 @@
./@MODULEDIR@/accf_httpready/accf_httpready.kmod modules-base-kernel kmod
./@MODULEDIR@/adosfs modules-base-kernel kmod
./@MODULEDIR@/adosfs/adosfs.kmod modules-base-kernel kmod
+./@MODULEDIR@/adiantum modules-base-kernel kmod
+./@MODULEDIR@/adiantum/adiantum.kmod modules-base-kernel kmod
./@MODULEDIR@/aio modules-base-kernel kmod
./@MODULEDIR@/aio/aio.kmod modules-base-kernel kmod
./@MODULEDIR@/am2315temp modules-base-kernel kmod
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.144 src/sys/dev/cgd.c:1.145
--- src/sys/dev/cgd.c:1.144 Fri Apr 1 00:21:19 2022
+++ src/sys/dev/cgd.c Fri Apr 1 21:09:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.144 2022/04/01 00:21:19 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.145 2022/04/01 21:09:24 pgoyette Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.144 2022/04/01 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.145 2022/04/01 21:09:24 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1723,7 +1723,7 @@ cgd_selftest(void)
aprint_debug("cgd: self-tests passed\n");
}
-MODULE(MODULE_CLASS_DRIVER, cgd, "blowfish,des,dk_subr,bufq_fcfs");
+MODULE(MODULE_CLASS_DRIVER, cgd, "adiantum,blowfish,des,dk_subr,bufq_fcfs");
#ifdef _MODULE
CFDRIVER_DECL(cgd, DV_DISK, NULL);
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.263 src/sys/modules/Makefile:1.264
--- src/sys/modules/Makefile:1.263 Fri Apr 1 15:49:11 2022
+++ src/sys/modules/Makefile Fri Apr 1 21:09:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.263 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.264 2022/04/01 21:09:24 pgoyette Exp $
.include <bsd.own.mk>
@@ -24,6 +24,7 @@ SUBDIR+= compat_crypto_50
SUBDIR+= accf_dataready
SUBDIR+= accf_httpready
SUBDIR+= adosfs
+SUBDIR+= adiantum
SUBDIR+= aio
SUBDIR+= audio
SUBDIR+= autofs
Added files:
Index: src/sys/modules/adiantum/Makefile
diff -u /dev/null src/sys/modules/adiantum/Makefile:1.1
--- /dev/null Fri Apr 1 21:09:24 2022
+++ src/sys/modules/adiantum/Makefile Fri Apr 1 21:09:24 2022
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2022/04/01 21:09:24 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/crypto/adiantum
+
+KMOD= adiantum
+SRCS= adiantum.c adiantum_selftest.c
+
+.include <bsd.kmodule.mk>
