Module Name: src
Committed By: pgoyette
Date: Sat Sep 29 04:11:07 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Don't #ifdef out the NTP compat calls.
The syscall number needs to be defined (for the autoload table) whether
or not the compat code is built in. The compat code will be included
in the module in all cases, but it makes explicit checks to ensure that
NTP code exists before executing.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.17 -r1.120.2.18 \
src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.17 src/sys/compat/netbsd32/syscalls.master:1.120.2.18
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.17 Fri Sep 14 10:41:13 2018
+++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:11:06 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -416,15 +416,10 @@
174 STD { netbsd32_ssize_t|netbsd32||pwrite(int fd, \
netbsd32_voidp buf, netbsd32_size_t nbyte, \
int PAD, netbsd32_off_t offset); }
-#if defined(NTP) || !defined(_KERNEL_OPT)
175 COMPAT_30 MODULAR compat_netbsd32_30 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); }
-#else
-175 EXCL ntp_gettime
-176 EXCL ntp_adjtime
-#endif
177 UNIMPL
178 UNIMPL
179 UNIMPL
@@ -899,13 +894,9 @@
{ int|netbsd32|30|fhstat( \
netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t sb); }
-#if defined(NTP) || !defined(_KERNEL_OPT)
393 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
-#else
-393 EXCL __ntp_gettime30
-#endif
394 STD { int|netbsd32|30|socket(int domain, int type, \
int protocol); }
395 STD { int|netbsd32|30|getfh(netbsd32_charp fname, \
