[src/trunk]: src/sys Changes to syscalls.master to exclude ntp_adjtime(2) ent...

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

details:   https://anonhg.NetBSD.org/src/rev/420e03ca5559
branches:  trunk
changeset: 495844:420e03ca5559
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Mon Aug 07 17:59:33 2000 +0000

description:
Changes to syscalls.master to exclude ntp_adjtime(2) entirely if NTP is not
defined.  Changes to other files will follow in a moment.

diffstat:

 sys/compat/aout/syscalls.master     |  8 +++++++-
 sys/compat/freebsd/syscalls.master  |  7 ++++++-
 sys/compat/netbsd32/syscalls.master |  7 ++++++-
 sys/compat/svr4/syscalls.master     |  8 +++++++-
 sys/kern/syscalls.master            |  8 +++++++-
 5 files changed, 33 insertions(+), 5 deletions(-)

diffs (142 lines):

diff -r 053eb26f9ac0 -r 420e03ca5559 sys/compat/aout/syscalls.master
--- a/sys/compat/aout/syscalls.master   Mon Aug 07 17:34:41 2000 +0000
+++ b/sys/compat/aout/syscalls.master   Mon Aug 07 17:59:33 2000 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.9 2000/05/04 21:52:32 kristerw Exp $
+       $NetBSD: syscalls.master,v 1.10 2000/08/07 17:59:35 bjh21 Exp $
 
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
 
@@ -36,6 +36,7 @@
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
+#include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
 #include "opt_sysv.h"
 #include "opt_compat_43.h"
@@ -354,8 +355,13 @@
                            size_t nbyte, int pad, off_t offset); }
 174    NOARGS          { ssize_t sys_pwrite(int fd, const void *buf, \
                            size_t nbyte, int pad, off_t offset); }
+; For some reason, ntp_gettime doesn't want to raise SIGSYS when it's excluded.
 175    NOARGS          { int sys_ntp_gettime(struct ntptimeval *ntvp); }
+#if defined(NTP) || !defined(_KERNEL)
 176    NOARGS          { int sys_ntp_adjtime(struct timex *tp); }
+#else
+176    EXCL            ntp_adjtime
+#endif
 177    UNIMPL
 178    UNIMPL
 179    UNIMPL
diff -r 053eb26f9ac0 -r 420e03ca5559 sys/compat/freebsd/syscalls.master
--- a/sys/compat/freebsd/syscalls.master        Mon Aug 07 17:34:41 2000 +0000
+++ b/sys/compat/freebsd/syscalls.master        Mon Aug 07 17:59:33 2000 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.28 2000/07/18 14:15:05 onoe Exp $
+       $NetBSD: syscalls.master,v 1.29 2000/08/07 17:59:36 bjh21 Exp $
 
 ;      from: @(#)syscalls.master       8.2 (Berkeley) 1/13/94
 
@@ -33,6 +33,7 @@
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
+#include "opt_ntp.h"
 #include "opt_sysv.h"
 #include "opt_compat_43.h"
 
@@ -348,7 +349,11 @@
 174    NOARGS          { ssize_t sys_pwrite(int fd, const void *buf, \
                            size_t nbyte, int pad, off_t offset); }
 175    UNIMPL
+#ifdefined NTP
 176    STD             { int freebsd_ntp_adjtime(struct freebsd_timex *tp); }
+#else
+176     EXCL            ntp_adjtime
+#endif
 177    UNIMPL          sfork
 178    UNIMPL          getdescriptor
 179    UNIMPL          setdescriptor
diff -r 053eb26f9ac0 -r 420e03ca5559 sys/compat/netbsd32/syscalls.master
--- a/sys/compat/netbsd32/syscalls.master       Mon Aug 07 17:34:41 2000 +0000
+++ b/sys/compat/netbsd32/syscalls.master       Mon Aug 07 17:59:33 2000 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.13 2000/07/09 13:39:32 mrg Exp $
+       $NetBSD: syscalls.master,v 1.14 2000/08/07 17:59:36 bjh21 Exp $
 
 ;      from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
@@ -286,8 +286,13 @@
 172    UNIMPL
 173    STD             { netbsd32_ssize_t netbsd32_pread(int fd, netbsd32_voidp buf, netbsd32_size_t nbyte, int pad, off_t offset); }
 174    STD             { netbsd32_ssize_t netbsd32_pwrite(int fd, const netbsd32_voidp buf, netbsd32_size_t nbyte, int pad, off_t offset); }
+; For some reason, ntp_gettime doesn't want to raise SIGSYS when it's excluded.
 175    STD             { int netbsd32_ntp_gettime(netbsd32_ntptimevalp_t ntvp); }
+#if defined(NTP) || !defined(_KERNEL)
 176    STD             { int netbsd32_ntp_adjtime(netbsd32_timexp_t tp); }
+#else
+176     EXCL            ntp_adjtime
+#endif
 177    UNIMPL
 178    UNIMPL
 179    UNIMPL
diff -r 053eb26f9ac0 -r 420e03ca5559 sys/compat/svr4/syscalls.master
--- a/sys/compat/svr4/syscalls.master   Mon Aug 07 17:34:41 2000 +0000
+++ b/sys/compat/svr4/syscalls.master   Mon Aug 07 17:59:33 2000 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.45 2000/06/06 18:07:33 soren Exp $
+       $NetBSD: syscalls.master,v 1.46 2000/08/07 17:59:36 bjh21 Exp $
 
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 
@@ -31,6 +31,7 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 ; #include's are copied to the syscall names and switch definition files only.
 
+#include "opt_ntp.h"
 #include "opt_sysv.h"
 
 #include <sys/param.h>
@@ -403,5 +404,10 @@
 246    NOARGS          { int sys_setsockopt(int s, int level, int name, \
                            const void *val, int valsize); }
 247    UNIMPL          sockconfig
+; For some reason, ntp_gettime doesn't want to raise SIGSYS when it's excluded.
 248    NOARGS          { int sys_ntp_gettime(struct ntptimeval *ntvp); }
+#if defined(NTP) || !defined(_KERNEL)
 249    NOARGS          { int sys_ntp_adjtime(struct timex *tp); }
+#else
+249    EXCL            ntp_adjtime
+#endif
diff -r 053eb26f9ac0 -r 420e03ca5559 sys/kern/syscalls.master
--- a/sys/kern/syscalls.master  Mon Aug 07 17:34:41 2000 +0000
+++ b/sys/kern/syscalls.master  Mon Aug 07 17:59:33 2000 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.101 2000/04/21 16:15:39 minoura Exp $
+       $NetBSD: syscalls.master,v 1.102 2000/08/07 17:59:33 bjh21 Exp $
 
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
 
@@ -36,6 +36,7 @@
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
+#include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
 #include "opt_sysv.h"
 #include "opt_compat_43.h"
@@ -339,8 +340,13 @@
                            size_t nbyte, int pad, off_t offset); }
 174    STD             { ssize_t sys_pwrite(int fd, const void *buf, \
                            size_t nbyte, int pad, off_t offset); }
+; For some reason, ntp_gettime doesn't want to raise SIGSYS when it's excluded.
 175    STD             { int sys_ntp_gettime(struct ntptimeval *ntvp); }
+#if defined(NTP) || !defined(_KERNEL)
 176    STD             { int sys_ntp_adjtime(struct timex *tp); }
+#else
+176    EXCL            ntp_adjtime
+#endif
 177    UNIMPL
 178    UNIMPL
 179    UNIMPL