[src/trunk]: src/sys/compat/netbsd32 always include netbsd32_ntp_adjtime(), L...

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

details:   https://anonhg.NetBSD.org/src/rev/7f213d929d82
branches:  trunk
changeset: 499839:7f213d929d82
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Nov 30 19:17:56 2000 +0000

description:
always include netbsd32_ntp_adjtime(), LKMify

diffstat:

 sys/compat/netbsd32/netbsd32_syscall.h     |  3 +--
 sys/compat/netbsd32/netbsd32_syscallargs.h |  5 +----
 sys/compat/netbsd32/netbsd32_syscalls.c    |  6 +-----
 sys/compat/netbsd32/netbsd32_sysent.c      |  9 +++------
 sys/compat/netbsd32/syscalls.master        |  8 +++-----
 5 files changed, 9 insertions(+), 22 deletions(-)

diffs (134 lines):

diff -r 94f1dae00953 -r 7f213d929d82 sys/compat/netbsd32/netbsd32_syscall.h
--- a/sys/compat/netbsd32/netbsd32_syscall.h    Thu Nov 30 19:14:35 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_syscall.h    Thu Nov 30 19:17:56 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.16 2000/08/18 19:35:21 cgd Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.17 2000/11/30 19:17:56 jdolecek Exp $ */
 
 /*
  * System call numbers.
@@ -451,7 +451,6 @@
 /* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
 #define        netbsd32_SYS_netbsd32_ntp_adjtime       176
 
-                               /* 176 is excluded ntp_adjtime */
 /* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
 #define        netbsd32_SYS_netbsd32_setgid    181
 
diff -r 94f1dae00953 -r 7f213d929d82 sys/compat/netbsd32/netbsd32_syscallargs.h
--- a/sys/compat/netbsd32/netbsd32_syscallargs.h        Thu Nov 30 19:14:35 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_syscallargs.h        Thu Nov 30 19:17:56 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.17 2000/08/18 19:35:21 cgd Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.18 2000/11/30 19:17:56 jdolecek Exp $ */
 
 /*
  * System call argument lists.
@@ -1387,10 +1387,7 @@
 int    netbsd32_pread(struct proc *, void *, register_t *);
 int    netbsd32_pwrite(struct proc *, void *, register_t *);
 int    netbsd32_ntp_gettime(struct proc *, void *, register_t *);
-#if defined(NTP) || !defined(_KERNEL)
 int    netbsd32_ntp_adjtime(struct proc *, void *, register_t *);
-#else
-#endif
 int    netbsd32_setgid(struct proc *, void *, register_t *);
 int    netbsd32_setegid(struct proc *, void *, register_t *);
 int    netbsd32_seteuid(struct proc *, void *, register_t *);
diff -r 94f1dae00953 -r 7f213d929d82 sys/compat/netbsd32/netbsd32_syscalls.c
--- a/sys/compat/netbsd32/netbsd32_syscalls.c   Thu Nov 30 19:14:35 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_syscalls.c   Thu Nov 30 19:17:56 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.17 2000/11/13 21:32:18 jdolecek Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.18 2000/11/30 19:17:57 jdolecek Exp $ */
 
 /*
  * System call names.
@@ -243,11 +243,7 @@
        "netbsd32_pread",                       /* 173 = netbsd32_pread */
        "netbsd32_pwrite",                      /* 174 = netbsd32_pwrite */
        "netbsd32_ntp_gettime",                 /* 175 = netbsd32_ntp_gettime */
-#if defined(NTP) || !defined(_KERNEL)
        "netbsd32_ntp_adjtime",                 /* 176 = netbsd32_ntp_adjtime */
-#else
-       "#176 (excluded ntp_adjtime)",          /* 176 = excluded ntp_adjtime */
-#endif
        "#177 (unimplemented)",         /* 177 = unimplemented */
        "#178 (unimplemented)",         /* 178 = unimplemented */
        "#179 (unimplemented)",         /* 179 = unimplemented */
diff -r 94f1dae00953 -r 7f213d929d82 sys/compat/netbsd32/netbsd32_sysent.c
--- a/sys/compat/netbsd32/netbsd32_sysent.c     Thu Nov 30 19:14:35 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_sysent.c     Thu Nov 30 19:17:56 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.16 2000/08/18 19:35:22 cgd Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.17 2000/11/30 19:17:57 jdolecek Exp $ */
 
 /*
  * System call switch table.
@@ -7,6 +7,7 @@
  * created from        NetBSD: syscalls.master,v 1.14 2000/08/07 17:59:36 bjh21 Exp 
  */
 
+#if defined ( _KERNEL )  && !defined ( _LKM ) 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
 #include "opt_compat_netbsd.h"
@@ -15,6 +16,7 @@
 #include "opt_compat_43.h"
 #include "fs_lfs.h"
 #include "fs_nfs.h"
+#endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
@@ -472,13 +474,8 @@
            netbsd32_pwrite },                  /* 174 = netbsd32_pwrite */
        { 1, s(struct netbsd32_ntp_gettime_args),
            netbsd32_ntp_gettime },             /* 175 = netbsd32_ntp_gettime */
-#if defined(NTP) || !defined(_KERNEL)
        { 1, s(struct netbsd32_ntp_adjtime_args),
            netbsd32_ntp_adjtime },             /* 176 = netbsd32_ntp_adjtime */
-#else
-       { 0, 0,
-           sys_nosys },                        /* 176 = excluded ntp_adjtime */
-#endif
        { 0, 0,
            sys_nosys },                        /* 177 = unimplemented */
        { 0, 0,
diff -r 94f1dae00953 -r 7f213d929d82 sys/compat/netbsd32/syscalls.master
--- a/sys/compat/netbsd32/syscalls.master       Thu Nov 30 19:14:35 2000 +0000
+++ b/sys/compat/netbsd32/syscalls.master       Thu Nov 30 19:17:56 2000 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.14 2000/08/07 17:59:36 bjh21 Exp $
+       $NetBSD: syscalls.master,v 1.15 2000/11/30 19:17:57 jdolecek Exp $
 
 ;      from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
@@ -35,6 +35,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.
 
+if defined(_KERNEL) && !defined(_LKM)
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
 #include "opt_compat_netbsd.h"
@@ -44,6 +45,7 @@
 
 #include "fs_lfs.h"
 #include "fs_nfs.h"
+endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -288,11 +290,7 @@
 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