[src/trunk]: src/sys/opencrypto Revert previous change to use SYSCTL_SETUP si...

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

details:   https://anonhg.NetBSD.org/src/rev/b0349c62ac12
branches:  trunk
changeset: 970963:b0349c62ac12
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Apr 08 15:27:18 2020 +0000

description:
Revert previous change to use SYSCTL_SETUP since it breaks on macppc.

For some reason, the crypto module fails to link, and this results in
opencrypto sysctl failures.

Should resolve PR kern/55154

diffstat:

 sys/opencrypto/crypto.c |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r de050a12a8cb -r b0349c62ac12 sys/opencrypto/crypto.c
--- a/sys/opencrypto/crypto.c   Wed Apr 08 10:57:16 2020 +0000
+++ b/sys/opencrypto/crypto.c   Wed Apr 08 15:27:18 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: crypto.c,v 1.113 2020/03/16 21:20:12 pgoyette Exp $ */
+/*     $NetBSD: crypto.c,v 1.114 2020/04/08 15:27:18 pgoyette Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $   */
 /*     $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
 
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.113 2020/03/16 21:20:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.114 2020/04/08 15:27:18 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -383,7 +383,8 @@
  */
 int    crypto_devallowsoft = 1;        /* only use hardware crypto */
 
-SYSCTL_SETUP(sysctl_opencrypto_setup, "opencrypto sysctl")
+static void
+sysctl_opencrypto_setup(struct sysctllog **clog)
 {
        const struct sysctlnode *ocnode;
        const struct sysctlnode *retqnode, *retkqnode;
@@ -518,6 +519,8 @@
 static int crypto_timing = 0;
 #endif
 
+static struct sysctllog *sysctl_opencrypto_clog;
+
 static void
 crypto_crp_ret_qs_init(void)
 {
@@ -584,6 +587,8 @@
                return crypto_destroy(false);
        }
 
+       sysctl_opencrypto_setup(&sysctl_opencrypto_clog);
+
        return 0;
 }
 
@@ -650,6 +655,9 @@
                }
        }
 
+       if (sysctl_opencrypto_clog != NULL)
+               sysctl_teardown(&sysctl_opencrypto_clog);
+
        if (crypto_ret_si != NULL)
                softint_disestablish(crypto_ret_si);