Author: jhb
Date: Tue Jun 11 23:28:07 2019
New Revision: 348974
URL: https://svnweb.freebsd.org/changeset/base/348974

Log:
  Move declaration of warninterval out from under COMPAT_FREEBSD32.
  
  This fixes builds of kernels without COMPAT_FREEBSD32.
  
  Reported by:  tinderbox
  MFC after:    1 month

Modified:
  head/sys/opencrypto/cryptodev.c

Modified: head/sys/opencrypto/cryptodev.c
==============================================================================
--- head/sys/opencrypto/cryptodev.c     Tue Jun 11 23:23:01 2019        
(r348973)
+++ head/sys/opencrypto/cryptodev.c     Tue Jun 11 23:28:07 2019        
(r348974)
@@ -146,11 +146,6 @@ struct cryptostats32 {
 #define        CIOCGSESSION232 _IOWR('c', 106, struct session2_op32)
 #define        CIOCKEY232      _IOWR('c', 107, struct crypt_kop32)
 
-static struct timeval warninterval = { .tv_sec = 60, .tv_usec = 0 };
-SYSCTL_TIMEVAL_SEC(_kern, OID_AUTO, cryptodev_warn_interval, CTLFLAG_RW,
-    &warninterval,
-    "Delay in seconds between warnings of deprecated /dev/crypto algorithms");
-
 static void
 session_op_from_32(const struct session_op32 *from, struct session_op *to)
 {
@@ -298,6 +293,11 @@ struct fcrypt {
        TAILQ_HEAD(csessionlist, csession) csessions;
        int             sesn;
 };
+
+static struct timeval warninterval = { .tv_sec = 60, .tv_usec = 0 };
+SYSCTL_TIMEVAL_SEC(_kern, OID_AUTO, cryptodev_warn_interval, CTLFLAG_RW,
+    &warninterval,
+    "Delay in seconds between warnings of deprecated /dev/crypto algorithms");
 
 static int cryptof_ioctl(struct file *, u_long, void *,
                    struct ucred *, struct thread *);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to