Module Name: src
Committed By: pgoyette
Date: Mon Sep 24 23:18:15 UTC 2018
Modified Files:
src/sys/dev [pgoyette-compat]: clockctl.c
src/sys/modules/clockctl [pgoyette-compat]: Makefile
Log Message:
Revert previous. We need a MP-safe way to determine _at_runtime_ if
the NTP option was included or not.
To generate a diff of this commit:
cvs rdiff -u -r1.35.14.5 -r1.35.14.6 src/sys/dev/clockctl.c
cvs rdiff -u -r1.1.20.2 -r1.1.20.3 src/sys/modules/clockctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.14.5 src/sys/dev/clockctl.c:1.35.14.6
--- src/sys/dev/clockctl.c:1.35.14.5 Mon Sep 24 00:01:13 2018
+++ src/sys/dev/clockctl.c Mon Sep 24 23:18:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.6 2018/09/24 23:18:15 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.6 2018/09/24 23:18:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -251,7 +251,6 @@ clockctlioctl(
error = clock_settime1(l->l_proc, args->clock_id, &ts, false);
break;
}
-#ifdef NTP
case CLOCKCTL_NTP_ADJTIME: {
struct clockctl_ntp_adjtime *args = data;
struct timex ntv;
@@ -271,7 +270,6 @@ clockctlioctl(
args->retval = ntp_timestatus();
break;
}
-#endif
default:
error = clockctl_ioctl_50_hook_f_call(dev, cmd, data, flags, l);
if (error == ENOSYS)
Index: src/sys/modules/clockctl/Makefile
diff -u src/sys/modules/clockctl/Makefile:1.1.20.2 src/sys/modules/clockctl/Makefile:1.1.20.3
--- src/sys/modules/clockctl/Makefile:1.1.20.2 Mon Sep 24 00:02:50 2018
+++ src/sys/modules/clockctl/Makefile Mon Sep 24 23:18:15 2018
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.20.2 2018/09/24 00:02:50 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.20.3 2018/09/24 23:18:15 pgoyette Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev
-CPPFLAGS+= -DNTP
-
KMOD= clockctl
IOCONF= clockctl.ioconf
SRCS= clockctl.c
