Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/pgoyette-compat]: src/sys/compat/netbsd32 Revert previous. Instead, don...



details:   https://anonhg.NetBSD.org/src/rev/be896ad295e6
branches:  pgoyette-compat
changeset: 830763:be896ad295e6
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 23 08:02:50 2018 +0000

description:
Revert previous.  Instead, don't put an entry for ntp_gettime in the
syscall package if we don't have NTP.

diffstat:

 sys/compat/netbsd32/netbsd32_compat_30.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 8706c35139d1 -r be896ad295e6 sys/compat/netbsd32/netbsd32_compat_30.c
--- a/sys/compat/netbsd32/netbsd32_compat_30.c  Sun Sep 23 08:01:13 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_30.c  Sun Sep 23 08:02:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $    */
+/*     $NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $   */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <opt_ntp.h>
@@ -301,10 +301,10 @@
        return (compat_30_sys_fhopen(l, &ua, retval));
 }
 
+#ifdef NTP
 int
 compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval)
 {
-#ifdef NTP
        /* {
                syscallarg(netbsd32_ntptimevalp_t) ntvp;
        } */
@@ -326,11 +326,8 @@
        }
 
        return (error);
-#else
-
-       return ENOSYS;
+}
 #endif
-}
 
 static struct syscall_package compat_netbsd32_30_syscalls[] = {
        { NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
@@ -353,8 +350,10 @@
            (sy_call_t *)compat_30_netbsd32___fhstat30 }, 
        { NETBSD32_SYS_compat_30_netbsd32_fhopen, 0,
            (sy_call_t *)compat_30_netbsd32_fhopen }, 
+#ifdef NTP
        { NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, 0,
            (sy_call_t *)compat_30_netbsd32_ntp_gettime }, 
+#endif
        { 0, 0, NULL }
 };
 



Home | Main Index | Thread Index | Old Index