summaryrefslogtreecommitdiff
path: root/sys/compat
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-10-26 23:23:52 +0000
committerriastradh <riastradh@NetBSD.org>2022-10-26 23:23:52 +0000
commit6183a1650dcce173f03806517a34bc4f2912657e (patch)
tree1645c8a863ab6d71342d5282dfaf476c079a08ab /sys/compat
parent02ea0cf69f46e94da5a207dad3bf004d74a62e12 (diff)
sys: Put externs for time_adjtime and time_adjusted in .h files.
time_adjtime: sys/timex.h (defined in ntp code) time_adjusted: sys/timevar.h (defined in non-ntp code) (Not really sure this is a valuable distinction to maintain; there's non-ntp code that uses time_adjtime too.)
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/netbsd32/netbsd32_compat_50.c9
-rw-r--r--sys/compat/netbsd32/netbsd32_time.c7
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/compat/netbsd32/netbsd32_compat_50.c b/sys/compat/netbsd32/netbsd32_compat_50.c
index 0c4a26c3dfd..10f3f305bc0 100644
--- a/sys/compat/netbsd32/netbsd32_compat_50.c
+++ b/sys/compat/netbsd32/netbsd32_compat_50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.52 2021/09/07 11:43:05 riastradh Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.53 2022/10/26 23:23:52 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.52 2021/09/07 11:43:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.53 2022/10/26 23:23:52 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.52 2021/09/07 11:43:05 rias
#include <sys/socketvar.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <sys/timevar.h>
+#include <sys/timex.h>
#include <sys/ktrace.h>
#include <sys/eventvar.h>
#include <sys/resourcevar.h>
@@ -247,9 +249,6 @@ compat_50_netbsd32_adjtime(struct lwp *l,
struct netbsd32_timeval50 atv;
int error;
- extern int time_adjusted; /* in kern_ntptime.c */
- extern int64_t time_adjtime; /* in kern_ntptime.c */
-
if ((error = kauth_authorize_system(l->l_cred,
KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_ADJTIME, NULL, NULL,
NULL)) != 0)
diff --git a/sys/compat/netbsd32/netbsd32_time.c b/sys/compat/netbsd32/netbsd32_time.c
index 507276159e4..a90fa6d0c30 100644
--- a/sys/compat/netbsd32/netbsd32_time.c
+++ b/sys/compat/netbsd32/netbsd32_time.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_time.c,v 1.57 2021/09/20 01:00:55 thorpej Exp $ */
+/* $NetBSD: netbsd32_time.c,v 1.58 2022/10/26 23:23:52 riastradh Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.57 2021/09/20 01:00:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.58 2022/10/26 23:23:52 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -261,9 +261,6 @@ netbsd32___adjtime50(struct lwp *l, const struct netbsd32___adjtime50_args *uap,
struct netbsd32_timeval atv;
int error;
- extern int time_adjusted; /* in kern_ntptime.c */
- extern int64_t time_adjtime; /* in kern_ntptime.c */
-
if ((error = kauth_authorize_system(l->l_cred,
KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_ADJTIME, NULL, NULL,
NULL)) != 0)