Module Name: src
Committed By: pgoyette
Date: Sun Sep 23 04:31:17 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_50_mod.c
src/sys/modules [pgoyette-compat]: Makefile
src/sys/modules/compat_crypto_50 [pgoyette-compat]: Makefile
src/sys/opencrypto [pgoyette-compat]: ocryptodev.h
Log Message:
No need to declare the crypto_50 init/fini routines. The compat_50
module no longer needs them, and they're declared static in the
ocryptodev.c code
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.202.2.36 -r1.202.2.37 src/sys/modules/Makefile
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r1.3.16.4 -r1.3.16.5 src/sys/opencrypto/ocryptodev.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/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.15 src/sys/compat/common/compat_50_mod.c:1.1.2.16
--- src/sys/compat/common/compat_50_mod.c:1.1.2.15 Sun Sep 23 04:27:48 2018
+++ src/sys/compat/common/compat_50_mod.c Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $ */
+/* $NetBSD: compat_50_mod.c,v 1.1.2.16 2018/09/23 04:31:17 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.16 2018/09/23 04:31:17 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -47,8 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: compat_50_mo
#include <sys/syscallvar.h>
#include <sys/syscallargs.h>
-#include <opencrypto/ocryptodev.h>
-
#include <compat/sys/clockctl.h>
#include <compat/common/compat_util.h>
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.36 src/sys/modules/Makefile:1.202.2.37
--- src/sys/modules/Makefile:1.202.2.36 Sun Sep 23 01:33:25 2018
+++ src/sys/modules/Makefile Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.36 2018/09/23 01:33:25 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.37 2018/09/23 04:31:17 pgoyette Exp $
.include <bsd.own.mk>
@@ -14,6 +14,7 @@ SUBDIR+= compat_60 compat_70 compat_
SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50
+SUBDIR+= compat_raid_50
SUBDIR+= compat_raid_80
SUBDIR+= compat_crypto_50
Index: src/sys/modules/compat_crypto_50/Makefile
diff -u src/sys/modules/compat_crypto_50/Makefile:1.1.2.2 src/sys/modules/compat_crypto_50/Makefile:1.1.2.3
--- src/sys/modules/compat_crypto_50/Makefile:1.1.2.2 Sun Sep 23 03:44:04 2018
+++ src/sys/modules/compat_crypto_50/Makefile Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.2 2018/09/23 03:44:04 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2018/09/23 04:31:17 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@ CPPFLAGS+= -DCOMPAT_50
.PATH: ${S}/opencrypto
-KMOD= crypto
+KMOD= compat_crypto_50
SRCS= ocryptodev.c
.include <bsd.kmodule.mk>
Index: src/sys/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.3.16.4 src/sys/opencrypto/ocryptodev.h:1.3.16.5
--- src/sys/opencrypto/ocryptodev.h:1.3.16.4 Sun Sep 23 03:44:04 2018
+++ src/sys/opencrypto/ocryptodev.h Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.3.16.4 2018/09/23 03:44:04 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.3.16.5 2018/09/23 04:31:17 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -178,7 +178,4 @@ struct crypt_n_op;
int ocryptof_ioctl(struct file *, u_long, void *);
-void cryptodev_50_init(void);
-void cryptodev_50_fini(void);
-
#endif /* _CRYPTO_OCRYPTODEV_H_ */
