[src/pgoyette-compat]: src/sys Revert previous. We need a MP-safe way to det...

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

details:   https://anonhg.NetBSD.org/src/rev/f5585afa7431
branches:  pgoyette-compat
changeset: 830782:f5585afa7431
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Sep 24 23:18:15 2018 +0000

description:
Revert previous.  We need a MP-safe way to determine _at_runtime_ if
the NTP option was included or not.

diffstat:

 sys/dev/clockctl.c            |  6 ++----
 sys/modules/clockctl/Makefile |  4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 22907038b1f8 -r f5585afa7431 sys/dev/clockctl.c
--- a/sys/dev/clockctl.c        Mon Sep 24 23:06:02 2018 +0000
+++ b/sys/dev/clockctl.c        Mon Sep 24 23:18:15 2018 +0000
@@ -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 @@
                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 @@
                        args->retval = ntp_timestatus();
                break;
        }
-#endif
        default:
                error = clockctl_ioctl_50_hook_f_call(dev, cmd, data, flags, l);
                if (error == ENOSYS)
diff -r 22907038b1f8 -r f5585afa7431 sys/modules/clockctl/Makefile
--- a/sys/modules/clockctl/Makefile     Mon Sep 24 23:06:02 2018 +0000
+++ b/sys/modules/clockctl/Makefile     Mon Sep 24 23:18:15 2018 +0000
@@ -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