Module Name:    src
Committed By:   pgoyette
Date:           Mon Sep 24 00:01:13 UTC 2018

Modified Files:
        src/sys/dev [pgoyette-compat]: clockctl.c

Log Message:
Don't compile NTP-related case if NTP is not available.

No HOOK required here since NTP is not modularized.


To generate a diff of this commit:
cvs rdiff -u -r1.35.14.4 -r1.35.14.5 src/sys/dev/clockctl.c

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.4 src/sys/dev/clockctl.c:1.35.14.5
--- src/sys/dev/clockctl.c:1.35.14.4	Tue Sep 18 23:03:54 2018
+++ src/sys/dev/clockctl.c	Mon Sep 24 00:01:13 2018
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockctl.c,v 1.35.14.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/*      $NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 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.4 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ntp.h"
@@ -251,6 +251,7 @@ 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;
@@ -270,6 +271,7 @@ clockctlioctl(
 			args->retval = ntp_timestatus();
 		break;
 	}
+#endif
 	default:
 		error = clockctl_ioctl_50_hook_f_call(dev, cmd, data, flags, l);
 		if (error == ENOSYS)

Reply via email to