CVS commit: src/sys/compat/sys
Module Name:src Committed By: kre Date: Fri Jun 15 08:17:38 UTC 2018 Modified Files: src/sys/compat/sys: time_types.h Log Message: Revert previous, mrg's fix is better (even with possible namespace issues, which I guess are not great in compat includes) the perils of two people doing fixes at around the same time. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/time_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/compat/sys
"Robert Elz" writes: > Module Name: src > Committed By: kre > Date: Fri Jun 15 07:46:59 UTC 2018 > > Modified Files: > src/sys/compat/sys: time_types.h > > Log Message: > If we are going to use offsetof() we'd need to include to > get it defined. Rather than deal with potential namespace issues > with that, just clear the entire struct, rather than attempting to > stop after the potential padding field. If the compiler is good enough > it should make no difference (there are just 3 fields, 2 named ones > are assigned to, immediately after the memset() - the compiler can > detect that, and not bother assigning (via memset()) to the unmamed > 3rd padding field). If the compiler is not smart enough to deal > with this, then I doubt writing 8 more zero bytes will make enough > difference to matter. the compiler isn't smart apparently, and the previous change should have fixed the problem. did we really need this too? .mrg.
CVS commit: src/sys/compat/sys
Module Name:src Committed By: kre Date: Fri Jun 15 07:46:59 UTC 2018 Modified Files: src/sys/compat/sys: time_types.h Log Message: If we are going to use offsetof() we'd need to include to get it defined. Rather than deal with potential namespace issues with that, just clear the entire struct, rather than attempting to stop after the potential padding field. If the compiler is good enough it should make no difference (there are just 3 fields, 2 named ones are assigned to, immediately after the memset() - the compiler can detect that, and not bother assigning (via memset()) to the unmamed 3rd padding field). If the compiler is not smart enough to deal with this, then I doubt writing 8 more zero bytes will make enough difference to matter. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/time_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sys
Module Name:src
Committed By: kre
Date: Fri Jun 15 07:46:59 UTC 2018
Modified Files:
src/sys/compat/sys: time_types.h
Log Message:
If we are going to use offsetof() we'd need to include to
get it defined. Rather than deal with potential namespace issues
with that, just clear the entire struct, rather than attempting to
stop after the potential padding field. If the compiler is good enough
it should make no difference (there are just 3 fields, 2 named ones
are assigned to, immediately after the memset() - the compiler can
detect that, and not bother assigning (via memset()) to the unmamed
3rd padding field). If the compiler is not smart enough to deal
with this, then I doubt writing 8 more zero bytes will make enough
difference to matter.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/time_types.h
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/sys/time_types.h
diff -u src/sys/compat/sys/time_types.h:1.3 src/sys/compat/sys/time_types.h:1.4
--- src/sys/compat/sys/time_types.h:1.3 Fri Jun 15 07:33:27 2018
+++ src/sys/compat/sys/time_types.h Fri Jun 15 07:46:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time_types.h,v 1.3 2018/06/15 07:33:27 mrg Exp $ */
+/* $NetBSD: time_types.h,v 1.4 2018/06/15 07:46:59 kre Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -97,7 +97,7 @@ static __inline void timespec_to_timespe
struct timespec50 *ts50)
{
#if INT32_MAX < LONG_MAX /* scrub padding */
- memset(ts50, 0, offsetof(struct timespec50, tv_nsec));
+ memset(ts50, 0, sizeof(struct timespec50));
#endif
ts50->tv_sec = (int32_t)ts->tv_sec;
ts50->tv_nsec = ts->tv_nsec;
CVS commit: src/sys/compat/sys
Module Name:src Committed By: mrg Date: Fri Jun 15 07:33:27 UTC 2018 Modified Files: src/sys/compat/sys: time_types.h Log Message: include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/sys/time_types.h 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/sys/time_types.h diff -u src/sys/compat/sys/time_types.h:1.2 src/sys/compat/sys/time_types.h:1.3 --- src/sys/compat/sys/time_types.h:1.2 Thu Jun 14 10:30:55 2018 +++ src/sys/compat/sys/time_types.h Fri Jun 15 07:33:27 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: time_types.h,v 1.2 2018/06/14 10:30:55 uwe Exp $ */ +/* $NetBSD: time_types.h,v 1.3 2018/06/15 07:33:27 mrg Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,13 @@ #ifndef _COMPAT_SYS_TIME_TYPES_H_ #define _COMPAT_SYS_TIME_TYPES_H_ +#ifdef _KERNEL +#include +#else +#include +#include +#endif + /* * Structure returned by gettimeofday(2) system call, * and used in other calls.
CVS commit: src/sys/compat/sys
Module Name:src Committed By: mrg Date: Fri Jun 15 07:33:27 UTC 2018 Modified Files: src/sys/compat/sys: time_types.h Log Message: include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/sys/time_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Tue Jun 5 00:58:17 UTC 2018 Modified Files: src/sys/compat/common: Makefile Log Message: use the standard rules, instead of rolling our own. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/compat/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: christos
Date: Tue Jun 5 00:58:17 UTC 2018
Modified Files:
src/sys/compat/common: Makefile
Log Message:
use the standard rules, instead of rolling our own.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/compat/common/Makefile
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/common/Makefile
diff -u src/sys/compat/common/Makefile:1.63 src/sys/compat/common/Makefile:1.64
--- src/sys/compat/common/Makefile:1.63 Tue Dec 19 23:46:19 2017
+++ src/sys/compat/common/Makefile Mon Jun 4 20:58:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2017/12/20 04:46:19 maya Exp $
+# $NetBSD: Makefile,v 1.64 2018/06/05 00:58:17 christos Exp $
LIB= compat
NOPIC= # defined
@@ -23,15 +23,9 @@ libinstall::
.undef DESTDIR
.include
-lib${LIB}.o:: ${OBJS:O}
- @echo building standard ${LIB} library
- @rm -f lib${LIB}.o
- @${LD} -r -o lib${LIB}.o ${LDFLAGS} `NM=${NM} ${LORDER} ${OBJS} | ${TSORT}`
-
-lib${LIB}.po:: ${POBJS:O}
- @echo building profiled ${LIB} library
- @rm -f lib${LIB}.po
- @${LD} -r -o lib${LIB}.po ${LDFLAGS} `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
+lib${LIB}.o:: ${OBJS:O} __buildstdlib
+
+lib${LIB}.po:: ${POBJS:O} __buildproflib
showsources: ${SRCS}
@echo ${.ALLSRC}
Re: CVS commit: src/sys/compat/svr4
Le 31/05/2018 à 17:41, Maxime Villard a écrit : Module Name:src Committed By: maxv Date: Thu May 31 15:41:11 UTC 2018 Modified Files: src/sys/compat/svr4: svr4_stream.c Log Message: Add XXX for NULL deref. Not sure how to fix it, not sure we care either... To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/compat/svr4/svr4_stream.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. I've said it once, I've said it a hundred times: compat_svr4, and all the related crap, should be removed from the kernel, plain and simple
CVS commit: src/sys/compat/svr4
Module Name:src
Committed By: maxv
Date: Thu May 31 15:41:11 UTC 2018
Modified Files:
src/sys/compat/svr4: svr4_stream.c
Log Message:
Add XXX for NULL deref. Not sure how to fix it, not sure we care either...
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/compat/svr4/svr4_stream.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/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.93 src/sys/compat/svr4/svr4_stream.c:1.94
--- src/sys/compat/svr4/svr4_stream.c:1.93 Sat May 5 02:09:40 2018
+++ src/sys/compat/svr4/svr4_stream.c Thu May 31 15:41:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $ */
+/* $NetBSD: svr4_stream.c,v 1.94 2018/05/31 15:41:11 maxv Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.94 2018/05/31 15:41:11 maxv Exp $");
#include
#include
@@ -1791,6 +1791,10 @@ svr4_sys_getmsg(struct lwp *l, const str
sc.cmd = SVR4_TI_RECVFROM_IND;
+ /*
+ * XXX: name = NULL?
+ */
+
switch (st->s_family) {
case AF_INET:
sc.len = sizeof (struct sockaddr_in);
CVS commit: src/sys/compat/svr4
Module Name:src Committed By: maxv Date: Thu May 31 15:41:11 UTC 2018 Modified Files: src/sys/compat/svr4: svr4_stream.c Log Message: Add XXX for NULL deref. Not sure how to fix it, not sure we care either... To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/compat/svr4/svr4_stream.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: kamil
Date: Sat May 26 21:07:47 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_sysctl.c
Log Message:
Fix sysctl(3):vm.minaddress in compat_netbsd32(8)
Cast minaddress from LP64-specific long (64-bit) to 32-bit long (int).
This value is usually 0 or 0+PAGE_SIZE. There is need to change type in
order to keep original code functional, without prompting the value with
'long long' or a similar approach.
There are more CTLTYPE_LONG with a need for fixes in the compat code:
uipc_usrreq.c
1975 CTLTYPE_LONG, "sendspace",
1981 CTLTYPE_LONG, "recvspace",
1987 CTLTYPE_LONG, "sendspace",
1993 CTLTYPE_LONG, "recvspace",
vfs_bio.c
1921 CTLTYPE_LONG, "bufmem",
1928 CTLTYPE_LONG, "bufmem_lowater",
1935 CTLTYPE_LONG, "bufmem_hiwater",
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/netbsd32/netbsd32_sysctl.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/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.39 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.40
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.39 Sat May 26 18:18:19 2018
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Sat May 26 21:07:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.39 2018/05/26 18:18:19 kamil Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.40 2018/05/26 21:07:47 kamil Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.39 2018/05/26 18:18:19 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.40 2018/05/26 21:07:47 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -153,6 +153,12 @@ netbsd32_sysctl_init(void)
SYSCTL_DESCR("Maximum user address"),
NULL, VM_MAXUSER_ADDRESS32, NULL, 0,
CTL_VM, VM_MAXADDRESS, CTL_EOL);
+ sysctl_createv(_clog, 0, &_root, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+ CTLTYPE_INT, "minaddress",
+ SYSCTL_DESCR("Minimum user address"),
+ NULL, VM_MIN_ADDRESS, NULL, 0,
+ CTL_VM, VM_MINADDRESS, CTL_EOL);
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: kamil Date: Sat May 26 21:07:47 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_sysctl.c Log Message: Fix sysctl(3):vm.minaddress in compat_netbsd32(8) Cast minaddress from LP64-specific long (64-bit) to 32-bit long (int). This value is usually 0 or 0+PAGE_SIZE. There is need to change type in order to keep original code functional, without prompting the value with 'long long' or a similar approach. There are more CTLTYPE_LONG with a need for fixes in the compat code: uipc_usrreq.c 1975 CTLTYPE_LONG, "sendspace", 1981 CTLTYPE_LONG, "recvspace", 1987 CTLTYPE_LONG, "sendspace", 1993 CTLTYPE_LONG, "recvspace", vfs_bio.c 1921 CTLTYPE_LONG, "bufmem", 1928 CTLTYPE_LONG, "bufmem_lowater", 1935 CTLTYPE_LONG, "bufmem_hiwater", Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: kamil
Date: Sat May 26 18:18:19 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_sysctl.c
Log Message:
Handle vm.maxaddress in compat_netbsd32(8)
Return VM_MAXUSER_ADDRESS32 instead of the 64-bit specific address.
Use CTLTYPE_INT instead of CTLTYPE_LONG in order to retain the same integer
type between 64-bit native kernel and 32-bit emulated program.
There probably should be CTLTYPE_LONG32 available for this purpose.
On NetBSD/i386:
vm.maxaddress=bfeff000
On NetBSD/amd64:
vm.maxaddress=7fbfdfeff000
On NetBSD/amd64 running i386 program:
vm.maxaddress=f000
A 32-bit program on the 64-bit kernel can use larger user space, this
difference is on purpose and expected.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/netbsd32/netbsd32_sysctl.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/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.39
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38 Tue Oct 31 16:10:25 2017
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Sat May 26 18:18:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.38 2017/10/31 16:10:25 kre Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.39 2018/05/26 18:18:19 kamil Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38 2017/10/31 16:10:25 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.39 2018/05/26 18:18:19 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -147,6 +147,12 @@ netbsd32_sysctl_init(void)
netbsd32_sysctl_vm_loadavg, 0, NULL,
sizeof(struct netbsd32_loadavg),
CTL_VM, VM_LOADAVG, CTL_EOL);
+ sysctl_createv(_clog, 0, &_root, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+ CTLTYPE_INT, "maxaddress",
+ SYSCTL_DESCR("Maximum user address"),
+ NULL, VM_MAXUSER_ADDRESS32, NULL, 0,
+ CTL_VM, VM_MAXADDRESS, CTL_EOL);
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: kamil Date: Sat May 26 18:18:19 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_sysctl.c Log Message: Handle vm.maxaddress in compat_netbsd32(8) Return VM_MAXUSER_ADDRESS32 instead of the 64-bit specific address. Use CTLTYPE_INT instead of CTLTYPE_LONG in order to retain the same integer type between 64-bit native kernel and 32-bit emulated program. There probably should be CTLTYPE_LONG32 available for this purpose. On NetBSD/i386: vm.maxaddress=bfeff000 On NetBSD/amd64: vm.maxaddress=7fbfdfeff000 On NetBSD/amd64 running i386 program: vm.maxaddress=f000 A 32-bit program on the 64-bit kernel can use larger user space, this difference is on purpose and expected. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Sun May 13 00:04:23 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_socket.c Log Message: PR/53280: Andreas Gustafsson: Fix panic in the fdpass test. This is probably the only 32 bit binary in the tests... To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/compat/netbsd32/netbsd32_socket.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/compat/netbsd32/netbsd32_socket.c diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.46 src/sys/compat/netbsd32/netbsd32_socket.c:1.47 --- src/sys/compat/netbsd32/netbsd32_socket.c:1.46 Wed May 9 22:36:07 2018 +++ src/sys/compat/netbsd32/netbsd32_socket.c Sat May 12 20:04:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_socket.c,v 1.46 2018/05/10 02:36:07 christos Exp $ */ +/* $NetBSD: netbsd32_socket.c,v 1.47 2018/05/13 00:04:23 christos Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.46 2018/05/10 02:36:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.47 2018/05/13 00:04:23 christos Exp $"); #include #include @@ -501,6 +501,7 @@ msg_send_copyin(struct lwp *l, const str if (error) goto out; msg->msg_iov = iov; + return 0; out: if (msg->msg_control) m_free(msg->msg_control);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Sun May 13 00:04:23 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_socket.c Log Message: PR/53280: Andreas Gustafsson: Fix panic in the fdpass test. This is probably the only 32 bit binary in the tests... To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/compat/netbsd32/netbsd32_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: nonaka Date: Thu May 10 09:33:46 UTC 2018 Modified Files: src/sys/compat/common: rtsock_50.c Log Message: Added missing ifi_link_state at compat_50_rt_oifmsg() and compat_50_iflist(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/rtsock_50.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/compat/common/rtsock_50.c diff -u src/sys/compat/common/rtsock_50.c:1.6 src/sys/compat/common/rtsock_50.c:1.7 --- src/sys/compat/common/rtsock_50.c:1.6 Sat Dec 16 09:10:30 2017 +++ src/sys/compat/common/rtsock_50.c Thu May 10 09:33:46 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock_50.c,v 1.6 2017/12/16 09:10:30 maxv Exp $ */ +/* $NetBSD: rtsock_50.c,v 1.7 2018/05/10 09:33:46 nonaka Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.6 2017/12/16 09:10:30 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.7 2018/05/10 09:33:46 nonaka Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -95,6 +95,7 @@ compat_50_rt_oifmsg(struct ifnet *ifp) oifm.ifm_data.ifi_type = ifp->if_data.ifi_type; oifm.ifm_data.ifi_addrlen = ifp->if_data.ifi_addrlen; oifm.ifm_data.ifi_hdrlen = ifp->if_data.ifi_hdrlen; + oifm.ifm_data.ifi_link_state = ifp->if_data.ifi_link_state; oifm.ifm_data.ifi_mtu = ifp->if_data.ifi_mtu; oifm.ifm_data.ifi_metric = ifp->if_data.ifi_metric; oifm.ifm_data.ifi_baudrate = ifp->if_data.ifi_baudrate; @@ -131,6 +132,7 @@ compat_50_iflist(struct ifnet *ifp, stru ifm->ifm_data.ifi_type = ifp->if_data.ifi_type; ifm->ifm_data.ifi_addrlen = ifp->if_data.ifi_addrlen; ifm->ifm_data.ifi_hdrlen = ifp->if_data.ifi_hdrlen; + ifm->ifm_data.ifi_link_state = ifp->if_data.ifi_link_state; ifm->ifm_data.ifi_mtu = ifp->if_data.ifi_mtu; ifm->ifm_data.ifi_metric = ifp->if_data.ifi_metric; ifm->ifm_data.ifi_baudrate = ifp->if_data.ifi_baudrate;
CVS commit: src/sys/compat/common
Module Name:src Committed By: nonaka Date: Thu May 10 09:33:46 UTC 2018 Modified Files: src/sys/compat/common: rtsock_50.c Log Message: Added missing ifi_link_state at compat_50_rt_oifmsg() and compat_50_iflist(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/rtsock_50.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Thu May 10 02:36:26 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132 -r1.133 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.13 -r1.14 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.24 -r1.25 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Thu May 10 02:36:08 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32.h netbsd32_compat_20.c
netbsd32_conv.h netbsd32_socket.c syscalls.master
Log Message:
add {send,recv}mmsg
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/netbsd32/netbsd32_socket.c
cvs rdiff -u -r1.120 -r1.121 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.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Thu May 10 02:36:08 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32.h netbsd32_compat_20.c
netbsd32_conv.h netbsd32_socket.c syscalls.master
Log Message:
add {send,recv}mmsg
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/netbsd32/netbsd32_socket.c
cvs rdiff -u -r1.120 -r1.121 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/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.117 src/sys/compat/netbsd32/netbsd32.h:1.118
--- src/sys/compat/netbsd32/netbsd32.h:1.117 Sat Apr 14 00:04:39 2018
+++ src/sys/compat/netbsd32/netbsd32.h Wed May 9 22:36:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.117 2018/04/14 04:04:39 mrg Exp $ */
+/* $NetBSD: netbsd32.h,v 1.118 2018/05/10 02:36:07 christos Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -715,6 +715,12 @@ struct netbsd32_omsghdr {
int msg_accrightslen;
};
+typedef netbsd32_pointer_t netbsd32_mmsghdrp_t;
+struct netbsd32_mmsghdr {
+ struct netbsd32_msghdr msg_hdr;
+ unsigned int msg_len;
+};
+
/* from */
typedef netbsd32_pointer_t netbsd32_stat12p_t;
struct netbsd32_stat12 { /* NetBSD-1.2 stat struct */
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.37
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36 Thu Apr 13 05:46:59 2017
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Wed May 9 22:36:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36 2017/04/13 09:46:59 hannken Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.37 2018/05/10 02:36:07 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36 2017/04/13 09:46:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.37 2018/05/10 02:36:07 christos Exp $");
#include
#include
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
#include
+#include
#include
#include
#include
Index: src/sys/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.34 src/sys/compat/netbsd32/netbsd32_conv.h:1.35
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.34 Thu Apr 19 17:50:08 2018
+++ src/sys/compat/netbsd32/netbsd32_conv.h Wed May 9 22:36:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.34 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.35 2018/05/10 02:36:07 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -289,6 +289,22 @@ netbsd32_from_msghdr(struct netbsd32_msg
}
static __inline void
+netbsd32_to_mmsghdr(const struct netbsd32_mmsghdr *mmsg32,
+struct mmsghdr *mmsg)
+{
+netbsd32_to_msghdr(>msg_hdr, >msg_hdr);
+mmsg->msg_len = mmsg32->msg_len;
+}
+
+static __inline void
+netbsd32_from_mmsghdr(struct netbsd32_mmsghdr *mmsg32,
+const struct mmsghdr *mmsg)
+{
+netbsd32_from_msghdr(>msg_hdr, >msg_hdr);
+mmsg32->msg_len = mmsg->msg_len;
+}
+
+static __inline void
netbsd32_from_statvfs(const struct statvfs *sbp, struct netbsd32_statvfs *sb32p)
{
sb32p->f_flag = sbp->f_flag;
Index: src/sys/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.45 src/sys/compat/netbsd32/netbsd32_socket.c:1.46
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.45 Thu May 3 17:43:33 2018
+++ src/sys/compat/netbsd32/netbsd32_socket.c Wed May 9 22:36:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.45 2018/05/03 21:43:33 christos Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.46 2018/05/10 02:36:07 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.45 2018/05/03 21:43:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.46 2018/05/10 02:36:07 christos Exp $");
#include
#include
@@ -159,6 +159,62 @@ copyout32_msg_control(struct lwp *l, str
return error;
}
+static int
+msg_recv_copyin(struct lwp *l, const struct netbsd32_msghdr *msg32,
+struct msghdr *msg, struct iovec *aiov)
+{
+ int error;
+ size_t iovsz;
+ struct iovec *iov = aiov;
+
+ iovsz = msg32->msg_iovlen * sizeof(struct iovec);
+ if (msg32->msg_iovlen > UIO_SMALLIOV) {
+ if (msg32->msg_iovlen > IOV_MAX)
+ return EMSGSIZE;
+ iov = kmem_alloc(iovsz, KM_SLEEP);
+ }
+
+ error = netbsd32_to_iovecin(NETBSD32PTR64(msg32->msg_iov), iov,
+ msg32->msg_iovlen);
+ if (error)
+ goto out;
+
+
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Thu May 10 02:36:26 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132 -r1.133 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/netbsd32/netbsd32_systrace_args.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134 src/sys/compat/netbsd32/netbsd32_syscall.h:1.135
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134 Sat Jan 6 11:41:23 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed May 9 22:36:26 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134 2018/01/06 16:41:23 kamil Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.135 2018/05/10 02:36:26 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1241,6 +1241,12 @@
/* syscall: "netbsd32_posix_spawn" ret: "int" args: "netbsd32_pid_tp" "const netbsd32_charp" "const netbsd32_posix_spawn_file_actionsp" "const netbsd32_posix_spawnattrp" "netbsd32_charpp" "netbsd32_charpp" */
#define NETBSD32_SYS_netbsd32_posix_spawn 474
+/* syscall: "netbsd32_recvmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" "netbsd32_timespecp_t" */
+#define NETBSD32_SYS_netbsd32_recvmmsg 475
+
+/* syscall: "netbsd32_sendmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" */
+#define NETBSD32_SYS_netbsd32_sendmmsg 476
+
/* syscall: "netbsd32_clock_nanosleep" ret: "int" args: "netbsd32_clockid_t" "int" "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32_clock_nanosleep 477
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.135
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134 Sat Jan 6 11:41:23 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed May 9 22:36:26 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134 2018/01/06 16:41:23 kamil Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.135 2018/05/10 02:36:26 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.117 2017/12/19 08:48:19 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2542,6 +2542,23 @@ struct netbsd32_posix_spawn_args {
};
check_syscall_args(netbsd32_posix_spawn)
+struct netbsd32_recvmmsg_args {
+ syscallarg(int) s;
+ syscallarg(netbsd32_mmsghdrp_t) mmsg;
+ syscallarg(unsigned int) vlen;
+ syscallarg(unsigned int) flags;
+ syscallarg(netbsd32_timespecp_t) timeout;
+};
+check_syscall_args(netbsd32_recvmmsg)
+
+struct netbsd32_sendmmsg_args {
+ syscallarg(int) s;
+ syscallarg(netbsd32_mmsghdrp_t) mmsg;
+ syscallarg(unsigned int) vlen;
+ syscallarg(unsigned int) flags;
+};
+check_syscall_args(netbsd32_sendmmsg)
+
struct netbsd32_clock_nanosleep_args {
syscallarg(netbsd32_clockid_t) clock_id;
syscallarg(int) flags;
@@ -3400,6 +3417,10 @@ int netbsd32___quotactl(struct lwp *, co
int netbsd32_posix_spawn(struct lwp *, const struct netbsd32_posix_spawn_args *, register_t *);
+int netbsd32_recvmmsg(struct lwp *, const struct netbsd32_recvmmsg_args *, register_t *);
+
+int netbsd32_sendmmsg(struct lwp *, const struct netbsd32_sendmmsg_args *, register_t *);
+
int netbsd32_clock_nanosleep(struct lwp *, const struct netbsd32_clock_nanosleep_args *, register_t *);
int netbsd32lwp_park60(struct lwp *, const struct netbsd32lwp_park60_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.133
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132 Sat Jan 6 11:41:23 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed May 9 22:36:26 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132 2018/01/06 16:41:23 kamil Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.133 2018/05/10 02:36:26 christos Exp $ */
CVS commit: src/sys/compat
Module Name:src Committed By: ozaki-r Date: Thu May 10 01:32:24 UTC 2018 Modified Files: src/sys/compat/linux/common: linux_socket.c src/sys/compat/linux32/common: linux32_socket.c Log Message: Fix pserialize enter/exit pairs in linux_getifconf and linux32_getifconf Tested by using a small linux program that uses ioctl(SIOCGIFCONF). Probably fix PR kern/53259 as well. To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/sys/compat/linux/common/linux_socket.c cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux32/common/linux32_socket.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/compat/linux/common/linux_socket.c diff -u src/sys/compat/linux/common/linux_socket.c:1.141 src/sys/compat/linux/common/linux_socket.c:1.142 --- src/sys/compat/linux/common/linux_socket.c:1.141 Thu May 3 21:43:33 2018 +++ src/sys/compat/linux/common/linux_socket.c Thu May 10 01:32:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.141 2018/05/03 21:43:33 christos Exp $ */ +/* $NetBSD: linux_socket.c,v 1.142 2018/05/10 01:32:24 ozaki-r Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.141 2018/05/03 21:43:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.142 2018/05/10 01:32:24 ozaki-r Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -1183,7 +1183,7 @@ linux_getifconf(struct lwp *l, register_ ifa_release(ifa, _ifa); } - s = pserialize_read_enter(); + KASSERT(pserialize_in_read_section()); if_release(ifp, ); } pserialize_read_exit(s); Index: src/sys/compat/linux32/common/linux32_socket.c diff -u src/sys/compat/linux32/common/linux32_socket.c:1.28 src/sys/compat/linux32/common/linux32_socket.c:1.29 --- src/sys/compat/linux32/common/linux32_socket.c:1.28 Wed Nov 22 10:19:14 2017 +++ src/sys/compat/linux32/common/linux32_socket.c Thu May 10 01:32:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socket.c,v 1.28 2017/11/22 10:19:14 ozaki-r Exp $ */ +/* $NetBSD: linux32_socket.c,v 1.29 2018/05/10 01:32:24 ozaki-r Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.28 2017/11/22 10:19:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.29 2018/05/10 01:32:24 ozaki-r Exp $"); #include #include @@ -478,7 +478,7 @@ linux32_getifconf(struct lwp *l, registe ifa_release(ifa, _ifa); } - s = pserialize_read_enter(); + KASSERT(pserialize_in_read_section()); if_release(ifp, ); } pserialize_read_exit(s);
CVS commit: src/sys/compat
Module Name:src Committed By: ozaki-r Date: Thu May 10 01:32:24 UTC 2018 Modified Files: src/sys/compat/linux/common: linux_socket.c src/sys/compat/linux32/common: linux32_socket.c Log Message: Fix pserialize enter/exit pairs in linux_getifconf and linux32_getifconf Tested by using a small linux program that uses ioctl(SIOCGIFCONF). Probably fix PR kern/53259 as well. To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/sys/compat/linux/common/linux_socket.c cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux32/common/linux32_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: christos
Date: Sat May 5 02:09:41 UTC 2018
Modified Files:
src/sys/compat/osf1: osf1_socket.c
src/sys/compat/svr4: svr4_stream.c
Log Message:
finish ktrace argument removal for do_sys_{send,recv}msg
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/osf1/osf1_socket.c
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/svr4/svr4_stream.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/compat/osf1/osf1_socket.c
diff -u src/sys/compat/osf1/osf1_socket.c:1.22 src/sys/compat/osf1/osf1_socket.c:1.23
--- src/sys/compat/osf1/osf1_socket.c:1.22 Tue Sep 13 03:01:08 2016
+++ src/sys/compat/osf1/osf1_socket.c Fri May 4 22:09:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_socket.c,v 1.22 2016/09/13 07:01:08 martin Exp $ */
+/* $NetBSD: osf1_socket.c,v 1.23 2018/05/05 02:09:40 christos Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.22 2016/09/13 07:01:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.23 2018/05/05 02:09:40 christos Exp $");
#include
#include
@@ -130,8 +130,7 @@ osf1_sys_sendmsg_xopen(struct lwp *l, co
bsd_iovec[i].iov_len = osf_iovec.iov_len;
}
- error = do_sys_sendmsg(l, SCARG(uap, s), _msghdr, flags, NULL, 0,
- retval);
+ error = do_sys_sendmsg(l, SCARG(uap, s), _msghdr, flags, retval);
err:
kmem_free(bsd_iovec, iov_len * sizeof(struct iovec));
return error;
Index: src/sys/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.92 src/sys/compat/svr4/svr4_stream.c:1.93
--- src/sys/compat/svr4/svr4_stream.c:1.92 Sat Sep 16 05:05:29 2017
+++ src/sys/compat/svr4/svr4_stream.c Fri May 4 22:09:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $ */
+/* $NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $");
#include
#include
@@ -1540,7 +1540,7 @@ svr4_sys_putmsg(struct lwp *l, const str
aiov.iov_base = NETBSD32PTR(dat.buf);
aiov.iov_len = dat.len;
error = do_sys_sendmsg(l, SCARG(uap, fd), ,
- SCARG(uap, flags), NULL, 0, retval);
+ SCARG(uap, flags), retval);
*retval = 0;
return error;
@@ -1781,7 +1781,7 @@ svr4_sys_getmsg(struct lwp *l, const str
aiov.iov_len = dat.maxlen;
msg.msg_flags = 0;
- error = do_sys_recvmsg(l, SCARG(uap, fd), , NULL, 0,
+ error = do_sys_recvmsg(l, SCARG(uap, fd), ,
, NULL, retval);
if (error) {
CVS commit: src/sys/compat
Module Name:src
Committed By: christos
Date: Sat May 5 02:09:41 UTC 2018
Modified Files:
src/sys/compat/osf1: osf1_socket.c
src/sys/compat/svr4: svr4_stream.c
Log Message:
finish ktrace argument removal for do_sys_{send,recv}msg
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/osf1/osf1_socket.c
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/svr4/svr4_stream.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Fri May 4 08:55:25 UTC 2018 Modified Files: src/sys/compat/common: compat_mod.c Log Message: Clean up a stray #ifdef _MODULE - it prevented definition of COMPAT_SIGCONTEXT which in turn prevented building of the SYS_compat16_sigaction_14 code. Should address PR kern/53260 XXX Pull-up to netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/compat/common/compat_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Fri May 4 08:55:25 UTC 2018 Modified Files: src/sys/compat/common: compat_mod.c Log Message: Clean up a stray #ifdef _MODULE - it prevented definition of COMPAT_SIGCONTEXT which in turn prevented building of the SYS_compat16_sigaction_14 code. Should address PR kern/53260 XXX Pull-up to netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/compat/common/compat_mod.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/compat/common/compat_mod.c diff -u src/sys/compat/common/compat_mod.c:1.28 src/sys/compat/common/compat_mod.c:1.29 --- src/sys/compat/common/compat_mod.c:1.28 Thu Apr 12 18:50:13 2018 +++ src/sys/compat/common/compat_mod.c Fri May 4 08:55:25 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_mod.c,v 1.28 2018/04/12 18:50:13 christos Exp $ */ +/* $NetBSD: compat_mod.c,v 1.29 2018/05/04 08:55:25 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.28 2018/04/12 18:50:13 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.29 2018/05/04 08:55:25 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -73,15 +73,13 @@ MODULE(MODULE_CLASS_EXEC, compat, NULL); int ttcompat(struct tty *, u_long, void *, int, struct lwp *); -#ifdef _MODULE #ifdef COMPAT_16 #if !defined(__amd64__) || defined(COMPAT_NETBSD32) #define COMPAT_SIGCONTEXT extern char sigcode[], esigcode[]; struct uvm_object *emul_netbsd_object; -#endif -#endif -#endif /* _MODULE */ +#endif /* !defined(__amd64__) || defined(COMPAT_NETBSD32) */ +#endif /* COMPAT_16 */ extern krwlock_t exec_lock; extern krwlock_t ttcompat_lock;
CVS commit: src/sys/compat/common
Module Name:src
Committed By: roy
Date: Thu Apr 26 08:11:18 UTC 2018
Modified Files:
src/sys/compat/common: uipc_syscalls_50.c
Log Message:
Test for valid interface for ioctls that demand it.
Thanks to Robert Swindells for the patch.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/uipc_syscalls_50.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/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.4 src/sys/compat/common/uipc_syscalls_50.c:1.5
--- src/sys/compat/common/uipc_syscalls_50.c:1.4 Thu Apr 12 18:50:13 2018
+++ src/sys/compat/common/uipc_syscalls_50.c Thu Apr 26 08:11:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_50.c,v 1.4 2018/04/12 18:50:13 christos Exp $ */
+/* $NetBSD: uipc_syscalls_50.c,v 1.5 2018/04/26 08:11:18 roy Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.4 2018/04/12 18:50:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.5 2018/04/26 08:11:18 roy Exp $");
#include
#include
@@ -63,10 +63,19 @@ compat_ifdatareq(struct lwp *l, u_long c
struct ifnet *ifp;
int error;
- ifp = ifunit(ifdr->ifdr_name);
- if (ifp == NULL)
- return ENXIO;
+ /* Validate arguments. */
+ switch (cmd) {
+ case SIOCGIFDATA:
+ case SIOCZIFDATA:
+ ifp = ifunit(ifdr->ifdr_name);
+ if (ifp == NULL)
+ return ENXIO;
+ break;
+ default:
+ return ENOSYS;
+ }
+ /* Do work. */
switch (cmd) {
case SIOCGIFDATA:
ifdatan2o(>ifdr_data, >if_data);
@@ -91,6 +100,7 @@ compat_ifdatareq(struct lwp *l, u_long c
return 0;
default:
+ /* Impossible due to above validation, but makes gcc happy. */
return ENOSYS;
}
}
CVS commit: src/sys/compat/common
Module Name:src Committed By: roy Date: Thu Apr 26 08:11:18 UTC 2018 Modified Files: src/sys/compat/common: uipc_syscalls_50.c Log Message: Test for valid interface for ioctls that demand it. Thanks to Robert Swindells for the patch. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/uipc_syscalls_50.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sys
Module Name:src
Committed By: pgoyette
Date: Sun Apr 15 22:13:36 UTC 2018
Modified Files:
src/sys/compat/sys: sockio.h
Log Message:
Remove unnecessary __BEGIN_DECLS ... __END_DECLS at Christos's suggestion.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/sys/sockio.h
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/sys/sockio.h
diff -u src/sys/compat/sys/sockio.h:1.11 src/sys/compat/sys/sockio.h:1.12
--- src/sys/compat/sys/sockio.h:1.11 Thu Apr 12 18:50:13 2018
+++ src/sys/compat/sys/sockio.h Sun Apr 15 22:13:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.11 2018/04/12 18:50:13 christos Exp $ */
+/* $NetBSD: sockio.h,v 1.12 2018/04/15 22:13:36 pgoyette Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -183,7 +183,6 @@ struct oifdatareq {
#ifdef _KERNEL
-__BEGIN_DECLS
extern int (*vec_compat_ifconf)(struct lwp *, u_long, void *);
extern int (*vec_compat_ifdatareq)(struct lwp *, u_long, void *);
@@ -191,7 +190,6 @@ void uipc_syscalls_40_init(void);
void uipc_syscalls_40_fini(void);
void uipc_syscalls_50_init(void);
void uipc_syscalls_50_fini(void);
-__END_DECLS
#endif
CVS commit: src/sys/compat/sys
Module Name:src Committed By: pgoyette Date: Sun Apr 15 22:13:36 UTC 2018 Modified Files: src/sys/compat/sys: sockio.h Log Message: Remove unnecessary __BEGIN_DECLS ... __END_DECLS at Christos's suggestion. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/compat/sys/sockio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: kamil
Date: Sun Apr 15 03:25:25 UTC 2018
Modified Files:
src/sys/compat/linux/common: linux_sched.c
Log Message:
Remove unused variable p from linux_sys_clone()
After refactoring by in 2010 (r. 1.63) the p variable is no longer
used.
As noted by its usage is also unsafe and might cause
use-after-free scenarios.
No functional change intended.
Reference: http://mail-index.netbsd.org/tech-kern/2017/09/08/msg022267.html
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/common/linux_sched.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/compat/linux/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.69 src/sys/compat/linux/common/linux_sched.c:1.70
--- src/sys/compat/linux/common/linux_sched.c:1.69 Fri Apr 21 15:10:34 2017
+++ src/sys/compat/linux/common/linux_sched.c Sun Apr 15 03:25:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.69 2017/04/21 15:10:34 christos Exp $ */
+/* $NetBSD: linux_sched.c,v 1.70 2018/04/15 03:25:25 kamil Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.69 2017/04/21 15:10:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.70 2018/04/15 03:25:25 kamil Exp $");
#include
#include
@@ -103,7 +103,6 @@ linux_sys_clone(struct lwp *l, const str
syscallarg(void *) tls;
syscallarg(void *) child_tidptr;
} */
- struct proc *p;
struct linux_emuldata *led;
int flags, sig, error;
@@ -159,7 +158,7 @@ linux_sys_clone(struct lwp *l, const str
* that makes this adjustment is a noop.
*/
if ((error = fork1(l, flags, sig, SCARG(uap, stack), 0,
- linux_child_return, NULL, retval, )) != 0) {
+ linux_child_return, NULL, retval, NULL)) != 0) {
DPRINTF(("%s: fork1: error %d\n", __func__, error));
return error;
}
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: kamil Date: Sun Apr 15 03:25:25 UTC 2018 Modified Files: src/sys/compat/linux/common: linux_sched.c Log Message: Remove unused variable p from linux_sys_clone() After refactoring by in 2010 (r. 1.63) the p variable is no longer used. As noted by its usage is also unsafe and might cause use-after-free scenarios. No functional change intended. Reference: http://mail-index.netbsd.org/tech-kern/2017/09/08/msg022267.html Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/common/linux_sched.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: mrg Date: Sat Apr 14 04:04:39 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32.h Log Message: redo the previous -- compat/sys/siginfo.h is already included later, as is another header. move them up near the top. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/compat/netbsd32/netbsd32.h 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/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116 src/sys/compat/netbsd32/netbsd32.h:1.117 --- src/sys/compat/netbsd32/netbsd32.h:1.116 Mon Dec 18 00:33:32 2017 +++ src/sys/compat/netbsd32/netbsd32.h Sat Apr 14 04:04:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116 2017/12/18 00:33:32 mrg Exp $ */ +/* $NetBSD: netbsd32.h,v 1.117 2018/04/14 04:04:39 mrg Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -1122,8 +1123,6 @@ int coredump_netbsd32(struct lwp *, stru /* * random other stuff */ -#include -#include vaddr_t netbsd32_vm_default_addr(struct proc *, vaddr_t, vsize_t, int); void netbsd32_adjust_limits(struct proc *);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: mrg Date: Sat Apr 14 04:04:39 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32.h Log Message: redo the previous -- compat/sys/siginfo.h is already included later, as is another header. move them up near the top. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/compat/netbsd32/netbsd32.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: christos
Date: Thu Apr 12 20:37:00 UTC 2018
Modified Files:
src/sys/compat/common: Makefile.inc
Log Message:
If we are modular, allow us to use modules for compat; don't load all the
compat code in.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/common/Makefile.inc
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/common/Makefile.inc
diff -u src/sys/compat/common/Makefile.inc:1.23 src/sys/compat/common/Makefile.inc:1.24
--- src/sys/compat/common/Makefile.inc:1.23 Sat Dec 16 03:31:36 2017
+++ src/sys/compat/common/Makefile.inc Thu Apr 12 16:36:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23 2017/12/16 08:31:36 maxv Exp $
+# $NetBSD: Makefile.inc,v 1.24 2018/04/12 20:36:59 christos Exp $
#
# Configuration variables (default values are below):
#
@@ -17,7 +17,11 @@
# Default values:
COMPATDST?= ${.OBJDIR}/lib/compat
+.if !empty(OPT_MODULAR)
+COMPAT_AS?= library
+.else
COMPAT_AS?= obj
+.endif
COMPATDOTDIR?= ../../.
COMPATDIR= ${S:S@^.@${COMPATDOTDIR}@:Q}/compat/common
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Thu Apr 12 20:37:00 UTC 2018 Modified Files: src/sys/compat/common: Makefile.inc Log Message: If we are modular, allow us to use modules for compat; don't load all the compat code in. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/compat/common/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: christos
Date: Thu Apr 12 18:50:13 UTC 2018
Modified Files:
src/sys/compat/common: compat_mod.c uipc_syscalls_40.c
uipc_syscalls_50.c
src/sys/compat/sys: sockio.h
Log Message:
provide vectors for the ifconf compat code and ifdatareq compat code.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/uipc_syscalls_50.c
cvs rdiff -u -r1.10 -r1.11 src/sys/compat/sys/sockio.h
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/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.27 src/sys/compat/common/compat_mod.c:1.28
--- src/sys/compat/common/compat_mod.c:1.27 Sun Mar 18 16:33:52 2018
+++ src/sys/compat/common/compat_mod.c Thu Apr 12 14:50:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.27 2018/03/18 20:33:52 christos Exp $ */
+/* $NetBSD: compat_mod.c,v 1.28 2018/04/12 18:50:13 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.27 2018/03/18 20:33:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.28 2018/04/12 18:50:13 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -63,6 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_mod.c
#include
#include
#include
+#include
#if defined(COMPAT_09) || defined(COMPAT_43) || defined(COMPAT_50)
static struct sysctllog *compat_clog = NULL;
@@ -257,7 +258,11 @@ compat_modcmd(modcmd_t cmd, void *arg)
#endif
#endif
compat_sysctl_init();
+#ifdef COMPAT_40
+ uipc_syscalls_40_init();
+#endif
#ifdef COMPAT_50
+ uipc_syscalls_50_init();
uvm_50_init();
#endif
#ifdef COMPAT_60
@@ -324,7 +329,11 @@ compat_modcmd(modcmd_t cmd, void *arg)
#endif
#endif /* COMPAT_16 */
compat_sysctl_fini();
+#ifdef COMPAT_40
+ uipc_syscalls_40_fini();
+#endif
#ifdef COMPAT_50
+ uipc_syscalls_50_fini();
uvm_50_fini();
#endif
#ifdef COMPAT_60
Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.15 src/sys/compat/common/uipc_syscalls_40.c:1.16
--- src/sys/compat/common/uipc_syscalls_40.c:1.15 Wed Nov 22 10:25:34 2017
+++ src/sys/compat/common/uipc_syscalls_40.c Thu Apr 12 14:50:13 2018
@@ -1,9 +1,9 @@
-/* $NetBSD: uipc_syscalls_40.c,v 1.15 2017/11/22 15:25:34 martin Exp $ */
+/* $NetBSD: uipc_syscalls_40.c,v 1.16 2018/04/12 18:50:13 christos Exp $ */
/* written by Pavel Cahyna, 2006. Public domain. */
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15 2017/11/22 15:25:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.16 2018/04/12 18:50:13 christos Exp $");
/*
* System call interface to the socket abstraction.
@@ -21,7 +21,6 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
#include
#include
-#ifdef COMPAT_OIFREQ
/*
* Return interface configuration
* of system. List may be used
@@ -29,8 +28,8 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
* other information.
*/
/*ARGSUSED*/
-int
-compat_ifconf(u_long cmd, void *data)
+static int
+compat_ifconf(struct lwp *l, u_long cmd, void *data)
{
struct oifconf *ifc = data;
struct ifnet *ifp;
@@ -42,6 +41,14 @@ compat_ifconf(u_long cmd, void *data)
int bound;
struct psref psref;
+ switch (cmd) {
+ case OSIOCGIFCONF:
+ case OOSIOCGIFCONF:
+ break;
+ default:
+ return ENOSYS;
+ }
+
if (docopy) {
space = ifc->ifc_len;
ifrp = ifc->ifc_req;
@@ -150,4 +157,15 @@ release_exit:
curlwp_bindx(bound);
return error;
}
-#endif
+
+void
+uipc_syscalls_40_init(void)
+{
+ vec_compat_ifconf = compat_ifconf;
+}
+
+void
+uipc_syscalls_40_fini(void)
+{
+ vec_compat_ifconf = (void *)enosys;
+}
Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.3 src/sys/compat/common/uipc_syscalls_50.c:1.4
--- src/sys/compat/common/uipc_syscalls_50.c:1.3 Wed Jan 19 05:21:16 2011
+++ src/sys/compat/common/uipc_syscalls_50.c Thu Apr 12 14:50:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_50.c,v 1.3 2011/01/19 10:21:16 tsutsui Exp $ */
+/* $NetBSD: uipc_syscalls_50.c,v 1.4 2018/04/12 18:50:13 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3 2011/01/19 10:21:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.4 2018/04/12 18:50:13 christos Exp $");
#include
#include
@@ -55,9 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
#include
#include
-#ifdef COMPAT_OIFDATA
/*ARGSUSED*/
-int
+static int
compat_ifdatareq(struct lwp *l, u_long cmd, void *data)
{
struct oifdatareq *ifdr = data;
@@ -92,7 +91,18 @@ compat_ifdatareq(struct lwp *l, u_long c
return 0;
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Thu Apr 12 18:50:13 UTC 2018 Modified Files: src/sys/compat/common: compat_mod.c uipc_syscalls_40.c uipc_syscalls_50.c src/sys/compat/sys: sockio.h Log Message: provide vectors for the ifconf compat code and ifdatareq compat code. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/compat/common/compat_mod.c cvs rdiff -u -r1.15 -r1.16 src/sys/compat/common/uipc_syscalls_40.c cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/uipc_syscalls_50.c cvs rdiff -u -r1.10 -r1.11 src/sys/compat/sys/sockio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: martin Date: Mon Mar 19 13:26:02 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: XXX stub it completely for now to make it compile To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/ccd_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: martin
Date: Mon Mar 19 13:26:02 UTC 2018
Modified Files:
src/sys/compat/common: ccd_60.c
Log Message:
XXX stub it completely for now to make it compile
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.6 src/sys/compat/common/ccd_60.c:1.7
--- src/sys/compat/common/ccd_60.c:1.6 Mon Mar 19 13:04:01 2018
+++ src/sys/compat/common/ccd_60.c Mon Mar 19 13:26:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.6 2018/03/19 13:04:01 christos Exp $ */
+/* $NetBSD: ccd_60.c,v 1.7 2018/03/19 13:26:02 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.6 2018/03/19 13:04:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.7 2018/03/19 13:26:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1
* sizeof (size_t) == sizeof (uint64_t) as CCDIOCSET will
* be the same as CCDIOCSET_60
*/
+#if 0
static int
compat_60_ccdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l,
int (*f)(dev_t, u_long, void *, int, struct lwp *))
@@ -89,11 +90,11 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
return ENOSYS;
}
}
+#endif
void
ccd_60_init(void)
{
- (void)compat_50_ccdioctl;
// compat_ccd_ioctl_60 = compat_60_ccdioctl;
}
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Mar 19 13:04:01 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: XXX: don't reference the global for now so that kernels without ccd build. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/common/ccd_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: christos
Date: Mon Mar 19 13:04:01 UTC 2018
Modified Files:
src/sys/compat/common: ccd_60.c
Log Message:
XXX: don't reference the global for now so that kernels without ccd build.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.5 src/sys/compat/common/ccd_60.c:1.6
--- src/sys/compat/common/ccd_60.c:1.5 Sun Mar 18 20:21:50 2018
+++ src/sys/compat/common/ccd_60.c Mon Mar 19 09:04:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.5 2018/03/19 00:21:50 christos Exp $ */
+/* $NetBSD: ccd_60.c,v 1.6 2018/03/19 13:04:01 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.5 2018/03/19 00:21:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.6 2018/03/19 13:04:01 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -93,11 +93,12 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
void
ccd_60_init(void)
{
-compat_ccd_ioctl_60 = compat_60_ccdioctl;
+ (void)compat_50_ccdioctl;
+// compat_ccd_ioctl_60 = compat_60_ccdioctl;
}
void
ccd_60_fini(void)
{
-compat_ccd_ioctl_60 = (void *)enosys;
+// compat_ccd_ioctl_60 = (void *)enosys;
}
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Mar 19 00:21:50 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: remove another error decl. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c diff -u src/sys/compat/common/ccd_60.c:1.4 src/sys/compat/common/ccd_60.c:1.5 --- src/sys/compat/common/ccd_60.c:1.4 Sun Mar 18 19:26:38 2018 +++ src/sys/compat/common/ccd_60.c Sun Mar 18 20:21:50 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ccd_60.c,v 1.4 2018/03/18 23:26:38 christos Exp $ */ +/* $NetBSD: ccd_60.c,v 1.5 2018/03/19 00:21:50 christos Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.4 2018/03/18 23:26:38 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.5 2018/03/19 00:21:50 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -77,8 +77,6 @@ compat_60_ccdioctl(dev_t dev, u_long cmd } case CCDIOCCLR_60: - int error; - if (data == NULL) return ENOSYS; /*
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Mar 19 00:21:50 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: remove another error decl. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/ccd_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: christos
Date: Sun Mar 18 23:26:39 UTC 2018
Modified Files:
src/sys/compat/common: ccd_60.c
Log Message:
remove error decl
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.3 src/sys/compat/common/ccd_60.c:1.4
--- src/sys/compat/common/ccd_60.c:1.3 Sun Mar 18 19:22:15 2018
+++ src/sys/compat/common/ccd_60.c Sun Mar 18 19:26:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.3 2018/03/18 23:22:15 christos Exp $ */
+/* $NetBSD: ccd_60.c,v 1.4 2018/03/18 23:26:38 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.3 2018/03/18 23:22:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.4 2018/03/18 23:26:38 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -52,8 +52,6 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
switch (cmd) {
#ifdef CCDIOCSET_60
case CCDIOCSET_60: {
- int error;
-
if (data == NULL)
return 0;
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Sun Mar 18 23:26:39 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: remove error decl To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/ccd_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: christos
Date: Sun Mar 18 23:22:15 UTC 2018
Modified Files:
src/sys/compat/common: ccd_60.c
Log Message:
- use the conditional from the header file
- fix compilation
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.2 src/sys/compat/common/ccd_60.c:1.3
--- src/sys/compat/common/ccd_60.c:1.2 Sun Mar 18 18:48:00 2018
+++ src/sys/compat/common/ccd_60.c Sun Mar 18 19:22:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.2 2018/03/18 22:48:00 pgoyette Exp $ */
+/* $NetBSD: ccd_60.c,v 1.3 2018/03/18 23:22:15 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.2 2018/03/18 22:48:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.3 2018/03/18 23:22:15 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -50,7 +50,7 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
int (*f)(dev_t, u_long, void *, int, struct lwp *))
{
switch (cmd) {
-#if defined(COMPAT_60) && !defined(_LP64)
+#ifdef CCDIOCSET_60
case CCDIOCSET_60: {
int error;
@@ -65,7 +65,7 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
ccio.ccio_ileave = ccio60->ccio_ileave;
ccio.ccio_flags = ccio60->ccio_flags;
ccio.ccio_unit = ccio60->ccio_unit;
- error = (*f)(dev, CCDIOCSET, , flag, l);
+ int error = (*f)(dev, CCDIOCSET, , flag, l);
if (!error) {
/* Copy data back, adjust types if necessary */
ccio60->ccio_disks = ccio.ccio_disks;
@@ -87,8 +87,8 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
* ccio_size member not used, so existing struct OK
* drop through to existing non-compat version
*/
- return (*f)(dev, CCDIOCLR, data, flag, l);
-#endif /* COMPAT_60 && !_LP64*/
+ return (*f)(dev, CCDIOCCLR, data, flag, l);
+#endif
default:
return ENOSYS;
}
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Sun Mar 18 23:22:15 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: - use the conditional from the header file - fix compilation To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/ccd_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Mar 18 22:48:00 UTC 2018 Modified Files: src/sys/compat/common: ccd_60.c Log Message: Declare 'error' if needed To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/ccd_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: pgoyette
Date: Sun Mar 18 22:48:00 UTC 2018
Modified Files:
src/sys/compat/common: ccd_60.c
Log Message:
Declare 'error' if needed
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.1 src/sys/compat/common/ccd_60.c:1.2
--- src/sys/compat/common/ccd_60.c:1.1 Sun Mar 18 20:33:52 2018
+++ src/sys/compat/common/ccd_60.c Sun Mar 18 22:48:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.1 2018/03/18 20:33:52 christos Exp $ */
+/* $NetBSD: ccd_60.c,v 1.2 2018/03/18 22:48:00 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1 2018/03/18 20:33:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.2 2018/03/18 22:48:00 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -52,6 +52,8 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
switch (cmd) {
#if defined(COMPAT_60) && !defined(_LP64)
case CCDIOCSET_60: {
+ int error;
+
if (data == NULL)
return 0;
@@ -77,6 +79,8 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
}
case CCDIOCCLR_60:
+ int error;
+
if (data == NULL)
return ENOSYS;
/*
CVS commit: src/sys/compat
Module Name:src
Committed By: christos
Date: Sun Mar 18 04:10:39 UTC 2018
Modified Files:
src/sys/compat/common: kern_cpu_60.c
src/sys/compat/sys: cpuio.h
Log Message:
include compat/sys/cpuio.h and multiple include protection.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/kern_cpu_60.c
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/sys/cpuio.h
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/common/kern_cpu_60.c
diff -u src/sys/compat/common/kern_cpu_60.c:1.2 src/sys/compat/common/kern_cpu_60.c:1.3
--- src/sys/compat/common/kern_cpu_60.c:1.2 Sat Mar 17 20:51:45 2018
+++ src/sys/compat/common/kern_cpu_60.c Sun Mar 18 00:10:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu_60.c,v 1.2 2018/03/18 00:51:45 christos Exp $ */
+/* $NetBSD: kern_cpu_60.c,v 1.3 2018/03/18 04:10:39 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.c,v 1.2 2018/03/18 00:51:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.c,v 1.3 2018/03/18 04:10:39 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -45,6 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.
#include
#include
+#include
+
static int
compat6_cpuctl_ioctl(struct lwp *l, u_long cmd, void *data)
{
Index: src/sys/compat/sys/cpuio.h
diff -u src/sys/compat/sys/cpuio.h:1.7 src/sys/compat/sys/cpuio.h:1.8
--- src/sys/compat/sys/cpuio.h:1.7 Sat Mar 17 20:51:45 2018
+++ src/sys/compat/sys/cpuio.h Sun Mar 18 00:10:39 2018
@@ -1,4 +1,7 @@
-/* $NetBSD: cpuio.h,v 1.7 2018/03/18 00:51:45 christos Exp $ */
+/* $NetBSD: cpuio.h,v 1.8 2018/03/18 04:10:39 christos Exp $ */
+
+#ifndef _SYS_COMPAT_CPUIO_H_
+#define _SYS_COMPAT_CPUIO_H_
#include
@@ -14,3 +17,5 @@ extern int (*compat_cpuctl_ioctl)(struct
void kern_cpu_60_init(void);
void kern_cpu_60_fini(void);
+
+#endif /* _SYS_COMPAT_CPUIO_H_ */
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Sun Mar 18 04:10:39 UTC 2018 Modified Files: src/sys/compat/common: kern_cpu_60.c src/sys/compat/sys: cpuio.h Log Message: include compat/sys/cpuio.h and multiple include protection. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/kern_cpu_60.c cvs rdiff -u -r1.7 -r1.8 src/sys/compat/sys/cpuio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Sat Mar 17 19:00:23 UTC 2018 Modified Files: src/sys/compat/common: Makefile.sysio compat_mod.c src/sys/compat/sys: cpuio.h Added Files: src/sys/compat/common: kern_cpu_60.c Log Message: redo the cpu ucode compat code. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/common/Makefile.sysio cvs rdiff -u -r1.25 -r1.26 src/sys/compat/common/compat_mod.c cvs rdiff -u -r0 -r1.1 src/sys/compat/common/kern_cpu_60.c cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sys/cpuio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: christos
Date: Sat Mar 17 19:00:23 UTC 2018
Modified Files:
src/sys/compat/common: Makefile.sysio compat_mod.c
src/sys/compat/sys: cpuio.h
Added Files:
src/sys/compat/common: kern_cpu_60.c
Log Message:
redo the cpu ucode compat code.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/common/kern_cpu_60.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sys/cpuio.h
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/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.8 src/sys/compat/common/Makefile.sysio:1.9
--- src/sys/compat/common/Makefile.sysio:1.8 Wed Mar 14 23:13:51 2018
+++ src/sys/compat/common/Makefile.sysio Sat Mar 17 15:00:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sysio,v 1.8 2018/03/15 03:13:51 christos Exp $
+# $NetBSD: Makefile.sysio,v 1.9 2018/03/17 19:00:23 christos Exp $
# Sources for syscall and ioctl compatibility across the versions.
@@ -35,7 +35,7 @@ SRCS+= kern_50.c kern_time_50.c kern_sel
vfs_syscalls_50.c uipc_syscalls_50.c uvm_50.c
# Compatibility code for NetBSD 6.0
-SRCS+= kern_sa_60.c tty_60.c kern_time_60.c
+SRCS+= kern_sa_60.c tty_60.c kern_time_60.c kern_cpu_60.c
# Compatibility code for NetBSD 7.0
SRCS+= rtsock_70.c uipc_usrreq_70.c
Index: src/sys/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.25 src/sys/compat/common/compat_mod.c:1.26
--- src/sys/compat/common/compat_mod.c:1.25 Wed Mar 14 23:13:51 2018
+++ src/sys/compat/common/compat_mod.c Sat Mar 17 15:00:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.25 2018/03/15 03:13:51 christos Exp $ */
+/* $NetBSD: compat_mod.c,v 1.26 2018/03/17 19:00:23 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.25 2018/03/15 03:13:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.26 2018/03/17 19:00:23 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_mod.c
#include
#include
#include
+#include
#if defined(COMPAT_09) || defined(COMPAT_43) || defined(COMPAT_50)
static struct sysctllog *compat_clog = NULL;
@@ -258,6 +259,9 @@ compat_modcmd(modcmd_t cmd, void *arg)
#ifdef COMPAT_50
uvm_50_init();
#endif
+#ifdef COMPAT_60
+ kern_cpu_60_init();
+#endif
return 0;
case MODULE_CMD_FINI:
@@ -321,6 +325,9 @@ compat_modcmd(modcmd_t cmd, void *arg)
#ifdef COMPAT_50
uvm_50_fini();
#endif
+#ifdef COMPAT_60
+ kern_cpu_60_fini();
+#endif
return 0;
default:
Index: src/sys/compat/sys/cpuio.h
diff -u src/sys/compat/sys/cpuio.h:1.5 src/sys/compat/sys/cpuio.h:1.6
--- src/sys/compat/sys/cpuio.h:1.5 Sun Sep 6 02:00:59 2015
+++ src/sys/compat/sys/cpuio.h Sat Mar 17 15:00:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuio.h,v 1.5 2015/09/06 06:00:59 dholland Exp $ */
+/* $NetBSD: cpuio.h,v 1.6 2018/03/17 19:00:23 christos Exp $ */
#include
@@ -7,5 +7,10 @@ struct compat6_cpu_ucode {
char fwname[PATH_MAX];
};
+extern int (*compat_cpuctl_ioctl)(u_long, void *);
+
#define OIOC_CPU_UCODE_GET_VERSION _IOR('c', 4, struct compat6_cpu_ucode)
#define OIOC_CPU_UCODE_APPLY_IOW('c', 5, struct compat6_cpu_ucode)
+
+void kern_cpu_60_init(void);
+void kern_cpu_60_fini(void);
Added files:
Index: src/sys/compat/common/kern_cpu_60.c
diff -u /dev/null src/sys/compat/common/kern_cpu_60.c:1.1
--- /dev/null Sat Mar 17 15:00:23 2018
+++ src/sys/compat/common/kern_cpu_60.c Sat Mar 17 15:00:23 2018
@@ -0,0 +1,75 @@
+/* $NetBSD: kern_cpu_60.c,v 1.1 2018/03/17 19:00:23 christos Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
CVS commit: src/sys/compat/sys
Module Name:src
Committed By: christos
Date: Thu Mar 15 03:22:23 UTC 2018
Modified Files:
src/sys/compat/sys: uvm.h
Log Message:
tidy up
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/sys/uvm.h
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/sys/uvm.h
diff -u src/sys/compat/sys/uvm.h:1.1 src/sys/compat/sys/uvm.h:1.2
--- src/sys/compat/sys/uvm.h:1.1 Wed Mar 14 23:13:51 2018
+++ src/sys/compat/sys/uvm.h Wed Mar 14 23:22:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm.h,v 1.1 2018/03/15 03:13:51 christos Exp $ */
+/* $NetBSD: uvm.h,v 1.2 2018/03/15 03:22:23 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,17 +32,6 @@
#ifndef _COMPAT_SYS_UVM_H_
#define _COMPAT_SYS_UVM_H_
-void uvm_13_init(void);
-void uvm_50_init(void);
-void uvm_13_fini(void);
-void uvm_50_fini(void);
-
-struct sys_swapctl_args;
-
-int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *);
-int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *);
-
-#endif /* _COMPAT_SYS_UVM_H_ */
/*
* NetBSD 1.3 swapctl(SWAP_STATS, ...) swapent structure; uses 32 bit
* dev_t and has no se_path[] member.
@@ -67,3 +56,19 @@ struct swapent50 {
int se50_priority; /* priority of this device */
char se50_path[PATH_MAX+1]; /* path name */
};
+
+__BEGIN_DECLS
+
+void uvm_13_init(void);
+void uvm_50_init(void);
+void uvm_13_fini(void);
+void uvm_50_fini(void);
+
+struct sys_swapctl_args;
+
+extern int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *);
+extern int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *);
+
+__END_DECLS
+
+#endif /* _COMPAT_SYS_UVM_H_ */
CVS commit: src/sys/compat/sys
Module Name:src Committed By: christos Date: Thu Mar 15 03:22:23 UTC 2018 Modified Files: src/sys/compat/sys: uvm.h Log Message: tidy up To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/sys/uvm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Thu Mar 15 03:13:51 UTC 2018 Modified Files: src/sys/compat/common: Makefile.sysio compat_mod.c Added Files: src/sys/compat/common: uvm_13.c uvm_50.c src/sys/compat/sys: uvm.h Log Message: add uvm swap compat code. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/common/Makefile.sysio cvs rdiff -u -r1.24 -r1.25 src/sys/compat/common/compat_mod.c cvs rdiff -u -r0 -r1.1 src/sys/compat/common/uvm_13.c \ src/sys/compat/common/uvm_50.c cvs rdiff -u -r0 -r1.1 src/sys/compat/sys/uvm.h 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/common/Makefile.sysio diff -u src/sys/compat/common/Makefile.sysio:1.7 src/sys/compat/common/Makefile.sysio:1.8 --- src/sys/compat/common/Makefile.sysio:1.7 Sat Nov 5 19:30:22 2016 +++ src/sys/compat/common/Makefile.sysio Wed Mar 14 23:13:51 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sysio,v 1.7 2016/11/05 23:30:22 pgoyette Exp $ +# $NetBSD: Makefile.sysio,v 1.8 2018/03/15 03:13:51 christos Exp $ # Sources for syscall and ioctl compatibility across the versions. @@ -13,7 +13,7 @@ SRCS+= kern_info_09.c SRCS+= kern_xxx_12.c vfs_syscalls_12.c vm_12.c # Compatibility code for NetBSD 1.3 -SRCS+= kern_sig_13.c +SRCS+= kern_sig_13.c uvm_13.c # Compatibility code for NetBSD 1.6 SRCS+= kern_sig_16.c @@ -32,7 +32,7 @@ SRCS+= vfs_syscalls_40.c uipc_syscalls_4 # Compatibility code for NetBSD 5.0 SRCS+= kern_50.c kern_time_50.c kern_select_50.c rndpseudo_50.c rtsock_50.c \ - vfs_syscalls_50.c uipc_syscalls_50.c + vfs_syscalls_50.c uipc_syscalls_50.c uvm_50.c # Compatibility code for NetBSD 6.0 SRCS+= kern_sa_60.c tty_60.c kern_time_60.c Index: src/sys/compat/common/compat_mod.c diff -u src/sys/compat/common/compat_mod.c:1.24 src/sys/compat/common/compat_mod.c:1.25 --- src/sys/compat/common/compat_mod.c:1.24 Sat Nov 5 19:30:22 2016 +++ src/sys/compat/common/compat_mod.c Wed Mar 14 23:13:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_mod.c,v 1.24 2016/11/05 23:30:22 pgoyette Exp $ */ +/* $NetBSD: compat_mod.c,v 1.25 2018/03/15 03:13:51 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24 2016/11/05 23:30:22 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.25 2018/03/15 03:13:51 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_mod.c #include #include #include +#include #if defined(COMPAT_09) || defined(COMPAT_43) || defined(COMPAT_50) static struct sysctllog *compat_clog = NULL; @@ -238,6 +239,9 @@ compat_modcmd(modcmd_t cmd, void *arg) ttcompatvec = ttcompat; if_43_init(); #endif +#ifdef COMPAT_13 + uvm_13_init(); +#endif #ifdef COMPAT_16 #if defined(COMPAT_SIGCONTEXT) KASSERT(emul_netbsd.e_sigobject == NULL); @@ -251,9 +255,15 @@ compat_modcmd(modcmd_t cmd, void *arg) #endif #endif compat_sysctl_init(); +#ifdef COMPAT_50 + uvm_50_init(); +#endif return 0; case MODULE_CMD_FINI: +#ifdef COMPAT_13 + uvm_13_fini(); +#endif #ifdef COMPAT_16 /* * Ensure sendsig_sigcontext() is not being used. @@ -308,6 +318,9 @@ compat_modcmd(modcmd_t cmd, void *arg) #endif #endif /* COMPAT_16 */ compat_sysctl_fini(); +#ifdef COMPAT_50 + uvm_50_fini(); +#endif return 0; default: Added files: Index: src/sys/compat/common/uvm_13.c diff -u /dev/null src/sys/compat/common/uvm_13.c:1.1 --- /dev/null Wed Mar 14 23:13:51 2018 +++ src/sys/compat/common/uvm_13.c Wed Mar 14 23:13:51 2018 @@ -0,0 +1,84 @@ +/* $NetBSD: uvm_13.c,v 1.1 2018/03/15 03:13:51 christos Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + *
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Thu Mar 15 03:13:51 UTC 2018 Modified Files: src/sys/compat/common: Makefile.sysio compat_mod.c Added Files: src/sys/compat/common: uvm_13.c uvm_50.c src/sys/compat/sys: uvm.h Log Message: add uvm swap compat code. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/common/Makefile.sysio cvs rdiff -u -r1.24 -r1.25 src/sys/compat/common/compat_mod.c cvs rdiff -u -r0 -r1.1 src/sys/compat/common/uvm_13.c \ src/sys/compat/common/uvm_50.c cvs rdiff -u -r0 -r1.1 src/sys/compat/sys/uvm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mlelstv
Date: Tue Mar 6 07:59:59 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
Add DIOCLWEDGES
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.58 -r1.59 src/sys/compat/netbsd32/netbsd32_ioctl.h
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/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.91 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.92
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.91 Fri Jan 19 23:38:56 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Tue Mar 6 07:59:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.91 2018/01/19 23:38:56 macallan Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.92 2018/03/06 07:59:59 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.91 2018/01/19 23:38:56 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.92 2018/03/06 07:59:59 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -535,6 +535,18 @@ netbsd32_to_devrescanargs(
p->locators = NETBSD32PTR64(s32p->locators);
}
+static inline void
+netbsd32_to_dkwedge_list(
+const struct netbsd32_dkwedge_list *s32p,
+struct dkwedge_list *p,
+u_long cmd)
+{
+ p->dkwl_buf = s32p->dkwl_buf;
+ p->dkwl_bufsize = s32p->dkwl_bufsize;
+ p->dkwl_nwedges = s32p->dkwl_nwedges;
+ p->dkwl_ncopied = s32p->dkwl_ncopied;
+}
+
/*
* handle ioctl conversions from 64-bit kernel -> netbsd32
*/
@@ -977,6 +989,18 @@ netbsd32_from_devrescanargs(
NETBSD32PTR32(s32p->locators, p->locators);
}
+static inline void
+netbsd32_from_dkwedge_list(
+const struct dkwedge_list *p,
+struct netbsd32_dkwedge_list *s32p,
+u_long cmd)
+{
+ s32p->dkwl_buf = p->dkwl_buf;
+ s32p->dkwl_bufsize = p->dkwl_bufsize;
+ s32p->dkwl_nwedges = p->dkwl_nwedges;
+ s32p->dkwl_ncopied = p->dkwl_ncopied;
+}
+
#ifdef NTP
static int
netbsd32_do_clockctl_ntp_adjtime(struct clockctl_ntp_adjtime *args)
@@ -1433,6 +1457,9 @@ netbsd32_ioctl(struct lwp *l, const stru
case DRVGETEVENT32:
IOCTL_STRUCT_CONV_TO(DRVGETEVENT, plistref);
+ case DIOCLWEDGES32:
+ IOCTL_STRUCT_CONV_TO(DIOCLWEDGES, dkwedge_list);
+
default:
#ifdef NETBSD32_MD_IOCTL
error = netbsd32_md_ioctl(fp, com, data32, l);
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.58 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.59
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.58 Fri Jan 19 23:38:56 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Tue Mar 6 07:59:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.58 2018/01/19 23:38:56 macallan Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.59 2018/03/06 07:59:59 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -633,3 +633,15 @@ struct netbsd32_devrescanargs {
#define DRVCTLCOMMAND32 _IOWR('D', 125, struct netbsd32_plistref)
#define DRVLISTDEV32 _IOWR('D', 127, struct netbsd32_devlistargs)
#define DRVGETEVENT32 _IOR('D', 128, struct netbsd32_plistref)
+
+/* From sys/disk.h, sys/dkio.h */
+
+struct netbsd32_dkwedge_list {
+ void *dkwl_buf; /* storage for dkwedge_info array */
+ netbsd32_size_t dkwl_bufsize; /* size of that buffer */
+ u_int dkwl_nwedges; /* total number of wedges */
+ u_int dkwl_ncopied; /* number actually copied */
+};
+
+#define DIOCLWEDGES32 _IOWR('d', 124, struct netbsd32_dkwedge_list)
+
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: mlelstv Date: Tue Mar 6 07:59:59 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h Log Message: Add DIOCLWEDGES To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.58 -r1.59 src/sys/compat/netbsd32/netbsd32_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/arm
Module Name:src Committed By: christos Date: Fri Jan 26 09:29:15 UTC 2018 Modified Files: src/sys/compat/linux/arch/arm: linux_ptrace.c Log Message: union was removed To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/compat/linux/arch/arm/linux_ptrace.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/compat/linux/arch/arm/linux_ptrace.c diff -u src/sys/compat/linux/arch/arm/linux_ptrace.c:1.20 src/sys/compat/linux/arch/arm/linux_ptrace.c:1.21 --- src/sys/compat/linux/arch/arm/linux_ptrace.c:1.20 Sun Aug 27 20:46:07 2017 +++ src/sys/compat/linux/arch/arm/linux_ptrace.c Fri Jan 26 04:29:15 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.20 2017/08/28 00:46:07 kamil Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.21 2018/01/26 09:29:15 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.20 2017/08/28 00:46:07 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.21 2018/01/26 09:29:15 christos Exp $"); #include #include @@ -206,7 +206,7 @@ linux_sys_ptrace_arch(struct lwp *l, con case LINUX_PTRACE_GET_THREAD_AREA: mutex_exit(t->p_lock); pcb = lwp_getpcb(l); - val = (void *)pcb->pcb_un.un_32.pcb32_user_pid_ro; + val = (void *)pcb->pcb_user_pid_ro; error = copyout(, (void *)SCARG(uap, data), sizeof(val)); break; #endif
CVS commit: src/sys/compat/linux/arch/arm
Module Name:src Committed By: christos Date: Fri Jan 26 09:29:15 UTC 2018 Modified Files: src/sys/compat/linux/arch/arm: linux_ptrace.c Log Message: union was removed To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/compat/linux/arch/arm/linux_ptrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: macallan
Date: Fri Jan 19 23:38:56 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
add conversion goop for WSDISPLAYIO_LDFONT and _SFONT
tested on mips64
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.57 -r1.58 src/sys/compat/netbsd32/netbsd32_ioctl.h
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/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.90 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.91
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.90 Sun Nov 26 17:46:13 2017
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Fri Jan 19 23:38:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.90 2017/11/26 17:46:13 jmcneill Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.91 2018/01/19 23:38:56 macallan Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.90 2017/11/26 17:46:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.91 2018/01/19 23:38:56 macallan Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -400,6 +400,31 @@ netbsd32_to_wsdisplay_cmap(struct netbsd
}
static inline void
+netbsd32_to_wsdisplay_font(struct netbsd32_wsdisplay_font *f32,
+ struct wsdisplay_font *f,
+ u_long cmd)
+{
+ f->name = NETBSD32PTR64(f32->name);
+ f->firstchar = f32->firstchar;
+ f->numchars = f32->numchars;
+ f->encoding = f32->encoding;
+ f->fontwidth = f32->fontwidth;
+ f->fontheight = f32->fontheight;
+ f->stride = f32->stride;
+ f->bitorder = f32->bitorder;
+ f->byteorder = f32->byteorder;
+ f->data = NETBSD32PTR64(f32->data);
+}
+
+static inline void
+netbsd32_to_wsdisplay_usefontdata(struct netbsd32_wsdisplay_usefontdata *f32,
+ struct wsdisplay_usefontdata *f,
+ u_long cmd)
+{
+ f->name = NETBSD32PTR64(f32->name);
+}
+
+static inline void
netbsd32_to_clockctl_settimeofday(
const struct netbsd32_clockctl_settimeofday *s32p,
struct clockctl_settimeofday *p,
@@ -767,6 +792,20 @@ netbsd32_from_wsdisplay_cmap(struct wsdi
}
static inline void
+netbsd32_from_wsdisplay_font(struct wsdisplay_font *f,
+ struct netbsd32_wsdisplay_font *f32,
+ u_long cmd)
+{
+}
+
+static inline void
+netbsd32_from_wsdisplay_usefontdata(struct wsdisplay_usefontdata *f,
+ struct netbsd32_wsdisplay_usefontdata *f32,
+ u_long cmd)
+{
+}
+
+static inline void
netbsd32_from_ieee80211req(struct ieee80211req *ireq,
struct netbsd32_ieee80211req *ireq32, u_long cmd)
{
@@ -1317,6 +1356,11 @@ netbsd32_ioctl(struct lwp *l, const stru
case WSDISPLAYIO_PUTCMAP32:
IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_PUTCMAP, wsdisplay_cmap);
+ case WSDISPLAYIO_LDFONT32:
+ IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_LDFONT, wsdisplay_font);
+ case WSDISPLAYIO_SFONT32:
+ IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_SFONT, wsdisplay_usefontdata);
+
case SIOCS8021132:
IOCTL_STRUCT_CONV_TO(SIOCS80211, ieee80211req);
case SIOCG8021132:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.57 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.58
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.57 Sun Nov 26 17:46:13 2017
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Fri Jan 19 23:38:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.57 2017/11/26 17:46:13 jmcneill Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.58 2018/01/19 23:38:56 macallan Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -179,6 +179,21 @@ struct netbsd32_wsdisplay_cursor {
#define WSDISPLAYIO_GCURSOR32 _IOWR('W', 73, struct netbsd32_wsdisplay_cursor)
#define WSDISPLAYIO_SCURSOR32 _IOW('W', 74, struct netbsd32_wsdisplay_cursor)
+struct netbsd32_wsdisplay_font {
+ netbsd32_charp name;
+ int firstchar, numchars;
+ int encoding;
+ u_int fontwidth, fontheight, stride;
+ int bitorder, byteorder;
+ netbsd32_charp data;
+};
+#define WSDISPLAYIO_LDFONT32 _IOW('W', 77, struct netbsd32_wsdisplay_font)
+
+struct netbsd32_wsdisplay_usefontdata {
+ netbsd32_charp name;
+};
+#define WSDISPLAYIO_SFONT32 _IOW('W', 80, struct netbsd32_wsdisplay_usefontdata)
+
/* can wait! */
#if 0
dev/ccdvar.h:219:#define CCDIOCSET _IOWR('F', 16, struct ccd_ioctl) /* enable ccd */
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: macallan Date: Fri Jan 19 23:38:56 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h Log Message: add conversion goop for WSDISPLAYIO_LDFONT and _SFONT tested on mips64 To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.57 -r1.58 src/sys/compat/netbsd32/netbsd32_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/compat/linux/common
On Jan 9, 12:33pm, m...@eterna.com.au (matthew green) wrote:
-- Subject: re: CVS commit: src/sys/compat/linux/common
| Christos Zoulas writes:
| > On Jan 9, 12:44am, m...@netbsd.org (m...@netbsd.org) wrote:
| > -- Subject: Re: CVS commit: src/sys/compat/linux/common
| >
| > | Why not add a signal?
| >
| > It is complicated to do so. It will even change the sigmask size.
|
| it will? don't we have support for upto 128 signals there?
|
| 1.2 (thorpej 18-Jan-03): typedef struct {
| 1.2 (thorpej 18-Jan-03): __uint32_t __bits[4];
| 1.2 (thorpej 18-Jan-03): } sigset_t;
|
| there might be some issues, but i was fairly sure when we went
| beyond the old 32 signals we made it upto 128.
|
| we should be able to make it work in the kernel, at least.
You need to look at the compat code for linux... Ours is fine I think.
We use the NSIG linux macro to compute the words. Yes, it can be done,
but it requires more changes.
christos
re: CVS commit: src/sys/compat/linux/common
Christos Zoulas writes:
> On Jan 9, 12:44am, m...@netbsd.org (m...@netbsd.org) wrote:
> -- Subject: Re: CVS commit: src/sys/compat/linux/common
>
> | Why not add a signal?
>
> It is complicated to do so. It will even change the sigmask size.
it will? don't we have support for upto 128 signals there?
1.2 (thorpej 18-Jan-03): typedef struct {
1.2 (thorpej 18-Jan-03): __uint32_t __bits[4];
1.2 (thorpej 18-Jan-03): } sigset_t;
there might be some issues, but i was fairly sure when we went
beyond the old 32 signals we made it upto 128.
we should be able to make it work in the kernel, at least.
.mrg.
CVS commit: src/sys/compat/linux32/common
Module Name:src Committed By: christos Date: Sun Jan 7 21:16:00 UTC 2018 Modified Files: src/sys/compat/linux32/common: linux32_signal.c Log Message: ignore signal 64 for now (go uses it) XXX: pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/compat/linux32/common/linux32_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux32/common
Module Name:src
Committed By: christos
Date: Sun Jan 7 21:16:00 UTC 2018
Modified Files:
src/sys/compat/linux32/common: linux32_signal.c
Log Message:
ignore signal 64 for now (go uses it)
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/compat/linux32/common/linux32_signal.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/compat/linux32/common/linux32_signal.c
diff -u src/sys/compat/linux32/common/linux32_signal.c:1.18 src/sys/compat/linux32/common/linux32_signal.c:1.19
--- src/sys/compat/linux32/common/linux32_signal.c:1.18 Sun Mar 8 13:10:44 2015
+++ src/sys/compat/linux32/common/linux32_signal.c Sun Jan 7 16:16:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_signal.c,v 1.18 2015/03/08 17:10:44 christos Exp $ */
+/* $NetBSD: linux32_signal.c,v 1.19 2018/01/07 21:16:00 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.18 2015/03/08 17:10:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.19 2018/01/07 21:16:00 christos Exp $");
#include
#include
@@ -299,6 +299,15 @@ linux32_sys_rt_sigaction(struct lwp *l,
}
sig = SCARG(uap, signum);
+ /*
+ * XXX: Linux has 33 realtime signals, the go binary wants to
+ * reset all of them; nothing else uses the last RT signal, so for
+ * now ignore it.
+ */
+ if (sig == LINUX__NSIG) {
+ uprintf("%s: setting signal %d ignored\n", __func__, sig);
+ sig--; /* back to 63 which is ignored */
+ }
if (sig < 0 || sig >= LINUX32__NSIG) {
DPRINTF(("rt_sigaction: Bad signal number %d %d\n",
sig, LINUX32__NSIG));
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: christos
Date: Sun Jan 7 21:14:38 UTC 2018
Modified Files:
src/sys/compat/linux/common: linux_sigaction.c linux_signal.c
Log Message:
Ignore signal 64 for now (go uses it)
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/linux/common/linux_sigaction.c
cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/common/linux_signal.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/compat/linux/common/linux_sigaction.c
diff -u src/sys/compat/linux/common/linux_sigaction.c:1.34 src/sys/compat/linux/common/linux_sigaction.c:1.35
--- src/sys/compat/linux/common/linux_sigaction.c:1.34 Fri Oct 17 16:21:34 2008
+++ src/sys/compat/linux/common/linux_sigaction.c Sun Jan 7 16:14:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sigaction.c,v 1.34 2008/10/17 20:21:34 njoly Exp $ */
+/* $NetBSD: linux_sigaction.c,v 1.35 2018/01/07 21:14:38 christos Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_sigaction.c,v 1.34 2008/10/17 20:21:34 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sigaction.c,v 1.35 2018/01/07 21:14:38 christos Exp $");
#include
#include
@@ -84,6 +84,15 @@ linux_sys_sigaction(struct lwp *l, const
linux_old_to_native_sigaction(, );
}
sig = SCARG(uap, signum);
+ /*
+ * XXX: Linux has 33 realtime signals, the go binary wants to
+ * reset all of them; nothing else uses the last RT signal, so for
+ * now ignore it.
+ */
+ if (sig == LINUX__NSIG) {
+ uprintf("%s: setting signal %d ignored\n", __func__, sig);
+ sig--; /* back to 63 which is ignored */
+ }
if (sig < 0 || sig >= LINUX__NSIG)
return (EINVAL);
if (sig > 0 && !linux_to_native_signo[sig]) {
Index: src/sys/compat/linux/common/linux_signal.c
diff -u src/sys/compat/linux/common/linux_signal.c:1.79 src/sys/compat/linux/common/linux_signal.c:1.80
--- src/sys/compat/linux/common/linux_signal.c:1.79 Mon Feb 20 11:30:41 2017
+++ src/sys/compat/linux/common/linux_signal.c Sun Jan 7 16:14:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.79 2017/02/20 16:30:41 rin Exp $ */
+/* $NetBSD: linux_signal.c,v 1.80 2018/01/07 21:14:38 christos Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.79 2017/02/20 16:30:41 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.80 2018/01/07 21:14:38 christos Exp $");
#define COMPAT_LINUX 1
@@ -346,6 +346,15 @@ linux_sys_rt_sigaction(struct lwp *l, co
}
sig = SCARG(uap, signum);
+ /*
+ * XXX: Linux has 33 realtime signals, the go binary wants to
+ * reset all of them; nothing else uses the last RT signal, so for
+ * now ignore it.
+ */
+ if (sig == LINUX__NSIG) {
+ uprintf("%s: setting signal %d ignored\n", __func__, sig);
+ sig--; /* back to 63 which is ignored */
+ }
if (sig < 0 || sig >= LINUX__NSIG)
return EINVAL;
if (sig > 0 && !linux_to_native_signo[sig]) {
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Sun Jan 7 21:14:38 UTC 2018 Modified Files: src/sys/compat/linux/common: linux_sigaction.c linux_signal.c Log Message: Ignore signal 64 for now (go uses it) XXX: pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/compat/linux/common/linux_sigaction.c cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/common/linux_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src Committed By: maxv Date: Mon Jan 1 08:03:43 UTC 2018 Modified Files: src/sys/compat/linux/arch/amd64: linux_machdep.c Log Message: Use the default %cs, and mask the other segregs. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/compat/linux/arch/amd64/linux_machdep.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/compat/linux/arch/amd64/linux_machdep.c diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.55 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.56 --- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.55 Sat Oct 21 07:24:26 2017 +++ src/sys/compat/linux/arch/amd64/linux_machdep.c Mon Jan 1 08:03:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.55 2017/10/21 07:24:26 maxv Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.56 2018/01/01 08:03:43 maxv Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.55 2017/10/21 07:24:26 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.56 2018/01/01 08:03:43 maxv Exp $"); #include #include @@ -205,9 +205,9 @@ linux_sendsig(const ksiginfo_t *ksi, con sigframe.uc.luc_mcontext.rsp = tf->tf_rsp; sigframe.uc.luc_mcontext.rip = tf->tf_rip; sigframe.uc.luc_mcontext.eflags = tf->tf_rflags; - sigframe.uc.luc_mcontext.cs = tf->tf_cs; - sigframe.uc.luc_mcontext.gs = tf->tf_gs; - sigframe.uc.luc_mcontext.fs = tf->tf_fs; + sigframe.uc.luc_mcontext.cs = GSEL(GUCODE_SEL, SEL_UPL); + sigframe.uc.luc_mcontext.gs = tf->tf_gs & 0x; + sigframe.uc.luc_mcontext.fs = tf->tf_fs & 0x; sigframe.uc.luc_mcontext.err = tf->tf_err; sigframe.uc.luc_mcontext.trapno = tf->tf_trapno; native_to_linux_sigset(, mask);
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src Committed By: maxv Date: Mon Jan 1 08:03:43 UTC 2018 Modified Files: src/sys/compat/linux/arch/amd64: linux_machdep.c Log Message: Use the default %cs, and mask the other segregs. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/compat/linux/arch/amd64/linux_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src
Committed By: maya
Date: Wed Dec 20 04:46:19 UTC 2017
Modified Files:
src/sys/compat/common: Makefile
Log Message:
Pass LDFLAGS to ld.
Without this, mips64-ld thinks we want to link our n64 objects with the
default ABI, n32.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/compat/common/Makefile
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/common/Makefile
diff -u src/sys/compat/common/Makefile:1.62 src/sys/compat/common/Makefile:1.63
--- src/sys/compat/common/Makefile:1.62 Sat Dec 16 10:15:12 2017
+++ src/sys/compat/common/Makefile Wed Dec 20 04:46:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2017/12/16 10:15:12 maxv Exp $
+# $NetBSD: Makefile,v 1.63 2017/12/20 04:46:19 maya Exp $
LIB= compat
NOPIC= # defined
@@ -26,12 +26,12 @@ libinstall::
lib${LIB}.o:: ${OBJS:O}
@echo building standard ${LIB} library
@rm -f lib${LIB}.o
- @${LD} -r -o lib${LIB}.o `NM=${NM} ${LORDER} ${OBJS} | ${TSORT}`
+ @${LD} -r -o lib${LIB}.o ${LDFLAGS} `NM=${NM} ${LORDER} ${OBJS} | ${TSORT}`
lib${LIB}.po:: ${POBJS:O}
@echo building profiled ${LIB} library
@rm -f lib${LIB}.po
- @${LD} -r -o lib${LIB}.po `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
+ @${LD} -r -o lib${LIB}.po ${LDFLAGS} `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
showsources: ${SRCS}
@echo ${.ALLSRC}
CVS commit: src/sys/compat/common
Module Name:src Committed By: maya Date: Wed Dec 20 04:46:19 UTC 2017 Modified Files: src/sys/compat/common: Makefile Log Message: Pass LDFLAGS to ld. Without this, mips64-ld thinks we want to link our n64 objects with the default ABI, n32. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/compat/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/ultrix
Module Name:src
Committed By: kamil
Date: Tue Dec 19 19:20:31 UTC 2017
Modified Files:
src/sys/compat/ultrix: syscalls.master ultrix_syscall.h
ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c
Log Message:
compat/ultrix: Drop SYS_vadvise
The (o)vadvise syscall is dummy since the beginning of NetBSD.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/ultrix/syscalls.master
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/ultrix/ultrix_syscall.h
cvs rdiff -u -r1.65 -r1.66 src/sys/compat/ultrix/ultrix_syscallargs.h
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscalls.c
cvs rdiff -u -r1.72 -r1.73 src/sys/compat/ultrix/ultrix_sysent.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/compat/ultrix/syscalls.master
diff -u src/sys/compat/ultrix/syscalls.master:1.54 src/sys/compat/ultrix/syscalls.master:1.55
--- src/sys/compat/ultrix/syscalls.master:1.54 Tue Dec 19 18:20:11 2017
+++ src/sys/compat/ultrix/syscalls.master Tue Dec 19 19:20:30 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp $
+ $NetBSD: syscalls.master,v 1.55 2017/12/19 19:20:30 kamil Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -122,7 +122,7 @@
70 OBSOL sstk
71 STD { int|ultrix_sys||mmap(void *addr, size_t len, \
int prot, u_int flags, int fd, long pos); }
-72 NOARGS { int|sys||ovadvise(int anom); } vadvise
+72 OBSOL vadvise
73 NOARGS { int|sys||munmap(void *addr, size_t len); }
74 NOARGS { int|sys||mprotect(void *addr, size_t len, \
int prot); }
Index: src/sys/compat/ultrix/ultrix_syscall.h
diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.70 src/sys/compat/ultrix/ultrix_syscall.h:1.71
--- src/sys/compat/ultrix/ultrix_syscall.h:1.70 Tue Dec 19 18:20:11 2017
+++ src/sys/compat/ultrix/ultrix_syscall.h Tue Dec 19 19:20:30 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscall.h,v 1.70 2017/12/19 18:20:11 kamil Exp $ */
+/* $NetBSD: ultrix_syscall.h,v 1.71 2017/12/19 19:20:30 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp
*/
#ifndef _ULTRIX_SYS_SYSCALL_H_
@@ -161,9 +161,7 @@
/* syscall: "mmap" ret: "int" args: "void *" "size_t" "int" "u_int" "int" "long" */
#define ULTRIX_SYS_mmap 71
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define ULTRIX_SYS_vadvise 72
-
+/* 72 is obsolete vadvise */
/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
#define ULTRIX_SYS_munmap 73
Index: src/sys/compat/ultrix/ultrix_syscallargs.h
diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.65 src/sys/compat/ultrix/ultrix_syscallargs.h:1.66
--- src/sys/compat/ultrix/ultrix_syscallargs.h:1.65 Tue Dec 19 18:20:11 2017
+++ src/sys/compat/ultrix/ultrix_syscallargs.h Tue Dec 19 19:20:30 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscallargs.h,v 1.65 2017/12/19 18:20:11 kamil Exp $ */
+/* $NetBSD: ultrix_syscallargs.h,v 1.66 2017/12/19 19:20:30 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp
*/
#ifndef _ULTRIX_SYS_SYSCALLARGS_H_
@@ -155,8 +155,6 @@ struct ultrix_sys_mmap_args {
};
check_syscall_args(ultrix_sys_mmap)
-struct sys_ovadvise_args;
-
struct sys_munmap_args;
struct sys_mprotect_args;
@@ -524,8 +522,6 @@ int sys_vfork(struct lwp *, const void *
int ultrix_sys_mmap(struct lwp *, const struct ultrix_sys_mmap_args *, register_t *);
-int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
-
int sys_munmap(struct lwp *, const struct sys_munmap_args *, register_t *);
int sys_mprotect(struct lwp *, const struct sys_mprotect_args *, register_t *);
Index: src/sys/compat/ultrix/ultrix_syscalls.c
diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.69 src/sys/compat/ultrix/ultrix_syscalls.c:1.70
--- src/sys/compat/ultrix/ultrix_syscalls.c:1.69 Tue Dec 19 18:20:11 2017
+++ src/sys/compat/ultrix/ultrix_syscalls.c Tue Dec 19 19:20:30 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $ */
+/* $NetBSD: ultrix_syscalls.c,v 1.70 2017/12/19 19:20:30 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.70 2017/12/19 19:20:30 kamil Exp
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: kamil Date: Tue Dec 19 19:20:31 UTC 2017 Modified Files: src/sys/compat/ultrix: syscalls.master ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: compat/ultrix: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/compat/ultrix/syscalls.master cvs rdiff -u -r1.70 -r1.71 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.65 -r1.66 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.72 -r1.73 src/sys/compat/ultrix/ultrix_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos32
Module Name:src Committed By: kamil Date: Tue Dec 19 19:19:51 UTC 2017 Modified Files: src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h sunos32_syscalls.c sunos32_sysent.c syscalls.master Log Message: compat/sunos32: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/compat/sunos32/sunos32_syscall.h cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_syscallargs.h \ src/sys/compat/sunos32/sunos32_syscalls.c cvs rdiff -u -r1.36 -r1.37 src/sys/compat/sunos32/sunos32_sysent.c cvs rdiff -u -r1.24 -r1.25 src/sys/compat/sunos32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos32
Module Name:src
Committed By: kamil
Date: Tue Dec 19 19:19:51 UTC 2017
Modified Files:
src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h
sunos32_syscalls.c sunos32_sysent.c syscalls.master
Log Message:
compat/sunos32: Drop SYS_vadvise
The (o)vadvise syscall is dummy since the beginning of NetBSD.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/sunos32/sunos32_syscall.h
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_syscallargs.h \
src/sys/compat/sunos32/sunos32_syscalls.c
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/sunos32/sunos32_sysent.c
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/sunos32/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/sunos32/sunos32_syscall.h
diff -u src/sys/compat/sunos32/sunos32_syscall.h:1.35 src/sys/compat/sunos32/sunos32_syscall.h:1.36
--- src/sys/compat/sunos32/sunos32_syscall.h:1.35 Tue Dec 19 18:25:53 2017
+++ src/sys/compat/sunos32/sunos32_syscall.h Tue Dec 19 19:19:50 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos32_syscall.h,v 1.35 2017/12/19 18:25:53 kamil Exp $ */
+/* $NetBSD: sunos32_syscall.h,v 1.36 2017/12/19 19:19:50 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp
+ * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp
*/
#ifndef _SUNOS32_SYS_SYSCALL_H_
@@ -161,9 +161,7 @@
/* syscall: "mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" */
#define SUNOS32_SYS_mmap 71
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define SUNOS32_SYS_vadvise 72
-
+/* 72 is obsolete vadvise */
/* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
#define SUNOS32_SYS_netbsd32_munmap 73
Index: src/sys/compat/sunos32/sunos32_syscallargs.h
diff -u src/sys/compat/sunos32/sunos32_syscallargs.h:1.34 src/sys/compat/sunos32/sunos32_syscallargs.h:1.35
--- src/sys/compat/sunos32/sunos32_syscallargs.h:1.34 Tue Dec 19 18:25:53 2017
+++ src/sys/compat/sunos32/sunos32_syscallargs.h Tue Dec 19 19:19:50 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos32_syscallargs.h,v 1.34 2017/12/19 18:25:53 kamil Exp $ */
+/* $NetBSD: sunos32_syscallargs.h,v 1.35 2017/12/19 19:19:50 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp
+ * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp
*/
#ifndef _SUNOS32_SYS_SYSCALLARGS_H_
@@ -189,8 +189,6 @@ struct sunos32_sys_mmap_args {
};
check_syscall_args(sunos32_sys_mmap)
-struct netbsd32_ovadvise_args;
-
struct netbsd32_munmap_args;
struct netbsd32_mprotect_args;
@@ -564,8 +562,6 @@ int sys_vfork(struct lwp *, const void *
int sunos32_sys_mmap(struct lwp *, const struct sunos32_sys_mmap_args *, register_t *);
-int netbsd32_ovadvise(struct lwp *, const struct netbsd32_ovadvise_args *, register_t *);
-
int netbsd32_munmap(struct lwp *, const struct netbsd32_munmap_args *, register_t *);
int netbsd32_mprotect(struct lwp *, const struct netbsd32_mprotect_args *, register_t *);
Index: src/sys/compat/sunos32/sunos32_syscalls.c
diff -u src/sys/compat/sunos32/sunos32_syscalls.c:1.34 src/sys/compat/sunos32/sunos32_syscalls.c:1.35
--- src/sys/compat/sunos32/sunos32_syscalls.c:1.34 Tue Dec 19 18:25:53 2017
+++ src/sys/compat/sunos32/sunos32_syscalls.c Tue Dec 19 19:19:50 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos32_syscalls.c,v 1.34 2017/12/19 18:25:53 kamil Exp $ */
+/* $NetBSD: sunos32_syscalls.c,v 1.35 2017/12/19 19:19:50 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp
+ * created from; NetBSD: syscalls.master,v 1.24 2017/12/19 18:25:53 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.34 2017/12/19 18:25:53 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.35 2017/12/19 19:19:50 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -104,7 +104,7 @@ const char *const sunos32_syscallnames[]
/* 69 */ "#69 (obsolete sbrk)",
/* 70 */ "#70 (obsolete sstk)",
/* 71 */ "mmap",
- /* 72 */ "vadvise",
+ /* 72 */ "#72 (obsolete vadvise)",
/* 73 */ "netbsd32_munmap",
/* 74 */ "netbsd32_mprotect",
/* 75 */ "netbsd32_madvise",
@@ -377,7 +377,7 @@ const char *const altsunos32_syscallname
/* 69 */ NULL, /* obsolete sbrk */
/* 70 */ NULL, /* obsolete sstk */
/* 71 */ NULL, /* mmap */
- /* 72 */ "ovadvise",
+ /* 72 */ NULL, /* obsolete vadvise */
/* 73 */ "munmap",
/* 74 */ "mprotect",
/* 75 */ "madvise",
CVS commit: src/sys/compat/sunos
Module Name:src Committed By: kamil Date: Tue Dec 19 19:19:16 UTC 2017 Modified Files: src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c syscalls.master Log Message: compat/sunos: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/compat/sunos/sunos_syscall.h cvs rdiff -u -r1.78 -r1.79 src/sys/compat/sunos/sunos_syscallargs.h \ src/sys/compat/sunos/syscalls.master cvs rdiff -u -r1.93 -r1.94 src/sys/compat/sunos/sunos_syscalls.c cvs rdiff -u -r1.89 -r1.90 src/sys/compat/sunos/sunos_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kamil Date: Tue Dec 19 19:18:18 UTC 2017 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master Log Message: compat/freebsd: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.70 -r1.71 src/sys/compat/freebsd/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: kamil
Date: Tue Dec 19 19:18:18 UTC 2017
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c syscalls.master
Log Message:
compat/freebsd: Drop SYS_vadvise
The (o)vadvise syscall is dummy since the beginning of NetBSD.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/freebsd/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/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.86 src/sys/compat/freebsd/freebsd_syscall.h:1.87
--- src/sys/compat/freebsd/freebsd_syscall.h:1.86 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_syscall.h Tue Dec 19 19:18:18 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.86 2017/12/19 18:15:08 kamil Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.87 2017/12/19 19:18:18 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -222,9 +222,7 @@
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define FREEBSD_SYS_ommap 71
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define FREEBSD_SYS_vadvise 72
-
+/* 72 is obsolete vadvise */
/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
#define FREEBSD_SYS_munmap 73
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.89 src/sys/compat/freebsd/freebsd_syscallargs.h:1.90
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.89 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Tue Dec 19 19:18:18 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.90 2017/12/19 19:18:18 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -167,8 +167,6 @@ check_syscall_args(freebsd_sys_msync)
struct compat_43_sys_mmap_args;
-struct sys_ovadvise_args;
-
struct sys_munmap_args;
struct sys_mprotect_args;
@@ -738,8 +736,6 @@ int sys_vfork(struct lwp *, const void *
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
-int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
-
int sys_munmap(struct lwp *, const struct sys_munmap_args *, register_t *);
int sys_mprotect(struct lwp *, const struct sys_mprotect_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.89 src/sys/compat/freebsd/freebsd_sysent.c:1.90
--- src/sys/compat/freebsd/freebsd_sysent.c:1.89 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_sysent.c Tue Dec 19 19:18:18 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.90 2017/12/19 19:18:18 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.90 2017/12/19 19:18:18 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -351,9 +351,8 @@ struct sysent freebsd_sysent[] = {
.sy_call = (sy_call_t *)compat_43_sys_mmap
}, /* 71 = ommap */
{
- ns(struct sys_ovadvise_args),
- .sy_call = (sy_call_t *)sys_ovadvise
- }, /* 72 = vadvise */
+ .sy_call = sys_nosys,
+ }, /* 72 = filler */
{
ns(struct sys_munmap_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.87 src/sys/compat/freebsd/freebsd_syscalls.c:1.88
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.87 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_syscalls.c Tue Dec 19 19:18:18 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.87 2017/12/19 18:15:08 kamil Exp $ */
+/*
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: kamil Date: Tue Dec 19 19:17:17 UTC 2017 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c syscalls.master Log Message: compat/aoutm68k: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.48 -r1.49 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.47 -r1.48 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.52 -r1.53 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.39 -r1.40 src/sys/compat/aoutm68k/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: kamil Date: Tue Dec 19 19:17:17 UTC 2017 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c syscalls.master Log Message: compat/aoutm68k: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.48 -r1.49 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.47 -r1.48 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.52 -r1.53 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.39 -r1.40 src/sys/compat/aoutm68k/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/aoutm68k/aoutm68k_syscall.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.50 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.51 --- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.50 Tue Dec 19 18:10:22 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Tue Dec 19 19:17:17 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscall.h,v 1.50 2017/12/19 18:10:22 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscall.h,v 1.51 2017/12/19 19:17:17 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp + * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp */ #ifndef _AOUTM68K_SYS_SYSCALL_H_ @@ -273,9 +273,7 @@ #else /* 71 is excluded compat_43_sys_mmap */ #endif -/* syscall: "vadvise" ret: "int" args: "int" */ -#define AOUTM68K_SYS_vadvise 72 - +/* 72 is obsolete vadvise */ /* syscall: "munmap" ret: "int" args: "void *" "size_t" */ #define AOUTM68K_SYS_munmap 73 Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.48 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.49 --- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.48 Tue Dec 19 18:10:22 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Tue Dec 19 19:17:17 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscallargs.h,v 1.48 2017/12/19 18:10:22 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscallargs.h,v 1.49 2017/12/19 19:17:17 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp + * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp */ #ifndef _AOUTM68K_SYS_SYSCALLARGS_H_ @@ -195,8 +195,6 @@ struct compat_43_sys_mmap_args; #else #endif -struct sys_ovadvise_args; - struct sys_munmap_args; struct sys_mprotect_args; @@ -823,8 +821,6 @@ int compat_43_sys_mmap(struct lwp *, con #else #endif -int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *); - int sys_munmap(struct lwp *, const struct sys_munmap_args *, register_t *); int sys_mprotect(struct lwp *, const struct sys_mprotect_args *, register_t *); Index: src/sys/compat/aoutm68k/aoutm68k_syscalls.c diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.47 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.48 --- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.47 Tue Dec 19 18:10:22 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Tue Dec 19 19:17:17 2017 @@ -1,14 +1,14 @@ -/* $NetBSD: aoutm68k_syscalls.c,v 1.47 2017/12/19 18:10:22 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscalls.c,v 1.48 2017/12/19 19:17:17 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp + * created from NetBSD: syscalls.master,v 1.39 2017/12/19 18:10:22 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.47 2017/12/19 18:10:22 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.48 2017/12/19 19:17:17 kamil Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -158,7 +158,7 @@ const char *const aoutm68k_syscallnames[ #else /* 71 */ "#71 (excluded compat_43_sys_mmap)", #endif - /* 72 */ "vadvise", + /* 72 */ "#72 (obsolete vadvise)", /* 73 */ "munmap", /* 74 */ "mprotect", /* 75 */ "madvise", @@ -905,7 +905,7 @@ const char *const altaoutm68k_syscallnam #else /* 71 */ NULL, /* excluded compat_43_sys_mmap */ #endif - /* 72 */ "ovadvise", + /* 72 */ NULL, /* obsolete vadvise */ /* 73 */ NULL, /* munmap */ /* 74 */ NULL, /* mprotect */ /* 75 */ NULL, /* madvise */ Index: src/sys/compat/aoutm68k/aoutm68k_sysent.c diff -u src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.52 src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.53 --- src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.52 Tue Dec 19 18:10:22 2017 +++
CVS commit: src/sys/compat/sunos32
Module Name:src
Committed By: kamil
Date: Tue Dec 19 18:25:53 UTC 2017
Modified Files:
src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h
sunos32_syscalls.c sunos32_sysent.c syscalls.master
Log Message:
compat/sunos32: Drop SYS_sbrk
sbrk - change data segment size
This syscall is dummy since the inception of the project.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_syscall.h
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/sunos32/sunos32_syscallargs.h \
src/sys/compat/sunos32/sunos32_syscalls.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/sunos32/sunos32_sysent.c
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/sunos32/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/sunos32/sunos32_syscall.h
diff -u src/sys/compat/sunos32/sunos32_syscall.h:1.34 src/sys/compat/sunos32/sunos32_syscall.h:1.35
--- src/sys/compat/sunos32/sunos32_syscall.h:1.34 Tue Dec 19 08:24:41 2017
+++ src/sys/compat/sunos32/sunos32_syscall.h Tue Dec 19 18:25:53 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos32_syscall.h,v 1.34 2017/12/19 08:24:41 kamil Exp $ */
+/* $NetBSD: sunos32_syscall.h,v 1.35 2017/12/19 18:25:53 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; NetBSD: syscalls.master,v 1.22 2013/11/07 19:37:19 njoly Exp
+ * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp
*/
#ifndef _SUNOS32_SYS_SYSCALL_H_
@@ -156,9 +156,7 @@
/* 67 is obsolete vread */
/* 68 is obsolete vwrite */
-/* syscall: "netbsd32_sbrk" ret: "int" args: "netbsd32_intptr_t" */
-#define SUNOS32_SYS_netbsd32_sbrk 69
-
+/* 69 is obsolete sbrk */
/* 70 is obsolete sstk */
/* syscall: "mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" */
#define SUNOS32_SYS_mmap 71
Index: src/sys/compat/sunos32/sunos32_syscallargs.h
diff -u src/sys/compat/sunos32/sunos32_syscallargs.h:1.33 src/sys/compat/sunos32/sunos32_syscallargs.h:1.34
--- src/sys/compat/sunos32/sunos32_syscallargs.h:1.33 Tue Dec 19 08:24:41 2017
+++ src/sys/compat/sunos32/sunos32_syscallargs.h Tue Dec 19 18:25:53 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos32_syscallargs.h,v 1.33 2017/12/19 08:24:41 kamil Exp $ */
+/* $NetBSD: sunos32_syscallargs.h,v 1.34 2017/12/19 18:25:53 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; NetBSD: syscalls.master,v 1.22 2013/11/07 19:37:19 njoly Exp
+ * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp
*/
#ifndef _SUNOS32_SYS_SYSCALLARGS_H_
@@ -179,8 +179,6 @@ struct sunos32_sys_omsync_args {
};
check_syscall_args(sunos32_sys_omsync)
-struct netbsd32_sbrk_args;
-
struct sunos32_sys_mmap_args {
syscallarg(netbsd32_voidp) addr;
syscallarg(netbsd32_size_t) len;
@@ -564,8 +562,6 @@ int sunos32_sys_omsync(struct lwp *, con
int sys_vfork(struct lwp *, const void *, register_t *);
-int netbsd32_sbrk(struct lwp *, const struct netbsd32_sbrk_args *, register_t *);
-
int sunos32_sys_mmap(struct lwp *, const struct sunos32_sys_mmap_args *, register_t *);
int netbsd32_ovadvise(struct lwp *, const struct netbsd32_ovadvise_args *, register_t *);
Index: src/sys/compat/sunos32/sunos32_syscalls.c
diff -u src/sys/compat/sunos32/sunos32_syscalls.c:1.33 src/sys/compat/sunos32/sunos32_syscalls.c:1.34
--- src/sys/compat/sunos32/sunos32_syscalls.c:1.33 Tue Dec 19 08:24:41 2017
+++ src/sys/compat/sunos32/sunos32_syscalls.c Tue Dec 19 18:25:53 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos32_syscalls.c,v 1.33 2017/12/19 08:24:41 kamil Exp $ */
+/* $NetBSD: sunos32_syscalls.c,v 1.34 2017/12/19 18:25:53 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; NetBSD: syscalls.master,v 1.22 2013/11/07 19:37:19 njoly Exp
+ * created from; NetBSD: syscalls.master,v 1.23 2017/12/19 08:24:41 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.33 2017/12/19 08:24:41 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_syscalls.c,v 1.34 2017/12/19 18:25:53 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -101,7 +101,7 @@ const char *const sunos32_syscallnames[]
/* 66 */ "vfork",
/* 67 */ "#67 (obsolete vread)",
/* 68 */ "#68 (obsolete vwrite)",
- /* 69 */ "netbsd32_sbrk",
+ /* 69 */ "#69 (obsolete sbrk)",
/* 70 */ "#70 (obsolete sstk)",
/* 71 */ "mmap",
/* 72 */ "vadvise",
@@ -374,7 +374,7 @@ const char *const altsunos32_syscallname
/* 66 */ NULL, /* vfork */
/* 67 */ NULL, /* obsolete vread */
/* 68 */ NULL, /* obsolete vwrite */
- /* 69 */ "sbrk",
+ /* 69 */ NULL, /* obsolete sbrk */
/* 70 */ NULL, /* obsolete sstk */
/* 71 */ NULL, /* mmap */
/*
CVS commit: src/sys/compat/sunos32
Module Name:src Committed By: kamil Date: Tue Dec 19 18:25:53 UTC 2017 Modified Files: src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h sunos32_syscalls.c sunos32_sysent.c syscalls.master Log Message: compat/sunos32: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_syscall.h cvs rdiff -u -r1.33 -r1.34 src/sys/compat/sunos32/sunos32_syscallargs.h \ src/sys/compat/sunos32/sunos32_syscalls.c cvs rdiff -u -r1.35 -r1.36 src/sys/compat/sunos32/sunos32_sysent.c cvs rdiff -u -r1.23 -r1.24 src/sys/compat/sunos32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos
Module Name:src
Committed By: kamil
Date: Tue Dec 19 18:24:21 UTC 2017
Modified Files:
src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h
sunos_syscalls.c sunos_sysent.c syscalls.master
Log Message:
compat/sunos: Drop SYS_sbrk
sbrk - change data segment size
This syscall is dummy since the inception of the project.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.77 -r1.78 src/sys/compat/sunos/sunos_syscallargs.h \
src/sys/compat/sunos/syscalls.master
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/sunos/sunos_sysent.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/compat/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.93 src/sys/compat/sunos/sunos_syscall.h:1.94
--- src/sys/compat/sunos/sunos_syscall.h:1.93 Tue Dec 19 08:25:37 2017
+++ src/sys/compat/sunos/sunos_syscall.h Tue Dec 19 18:24:21 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.93 2017/12/19 08:25:37 kamil Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.94 2017/12/19 18:24:21 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.76 2013/11/07 19:37:19 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp
*/
#ifndef _SUNOS_SYS_SYSCALL_H_
@@ -156,9 +156,7 @@
/* 67 is obsolete vread */
/* 68 is obsolete vwrite */
-/* syscall: "sbrk" ret: "int" args: "intptr_t" */
-#define SUNOS_SYS_sbrk 69
-
+/* 69 is obsolete sbrk */
/* 70 is obsolete sstk */
/* syscall: "mmap" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" */
#define SUNOS_SYS_mmap 71
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.77 src/sys/compat/sunos/sunos_syscallargs.h:1.78
--- src/sys/compat/sunos/sunos_syscallargs.h:1.77 Tue Dec 19 08:25:37 2017
+++ src/sys/compat/sunos/sunos_syscallargs.h Tue Dec 19 18:24:21 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.77 2017/12/19 08:25:37 kamil Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.78 2017/12/19 18:24:21 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.76 2013/11/07 19:37:19 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp
*/
#ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -167,8 +167,6 @@ struct sunos_sys_omsync_args {
};
check_syscall_args(sunos_sys_omsync)
-struct sys_sbrk_args;
-
struct sunos_sys_mmap_args {
syscallarg(void *) addr;
syscallarg(size_t) len;
@@ -552,8 +550,6 @@ int sunos_sys_omsync(struct lwp *, const
int sys_vfork(struct lwp *, const void *, register_t *);
-int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-
int sunos_sys_mmap(struct lwp *, const struct sunos_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/sunos/syscalls.master
diff -u src/sys/compat/sunos/syscalls.master:1.77 src/sys/compat/sunos/syscalls.master:1.78
--- src/sys/compat/sunos/syscalls.master:1.77 Tue Dec 19 08:25:37 2017
+++ src/sys/compat/sunos/syscalls.master Tue Dec 19 18:24:21 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp $
+ $NetBSD: syscalls.master,v 1.78 2017/12/19 18:24:21 kamil Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -128,7 +128,7 @@
66 NOARGS { int|sys||vfork(void); }
67 OBSOL vread
68 OBSOL vwrite
-69 NOARGS { int|sys||sbrk(intptr_t incr); }
+69 OBSOL sbrk
70 OBSOL sstk
71 STD { void *|sunos_sys||mmap(void *addr, size_t len, \
int prot, int flags, int fd, long pos); }
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.92 src/sys/compat/sunos/sunos_syscalls.c:1.93
--- src/sys/compat/sunos/sunos_syscalls.c:1.92 Tue Dec 19 08:25:37 2017
+++ src/sys/compat/sunos/sunos_syscalls.c Tue Dec 19 18:24:21 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.92 2017/12/19 08:25:37 kamil Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.93 2017/12/19 18:24:21 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.76 2013/11/07 19:37:19 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.92 2017/12/19 08:25:37 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.93 2017/12/19 18:24:21 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -97,7 +97,7 @@ const char *const sunos_syscallnames[] =
/* 66 */
CVS commit: src/sys/compat/sunos
Module Name:src Committed By: kamil Date: Tue Dec 19 18:24:21 UTC 2017 Modified Files: src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c syscalls.master Log Message: compat/sunos: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/compat/sunos/sunos_syscall.h cvs rdiff -u -r1.77 -r1.78 src/sys/compat/sunos/sunos_syscallargs.h \ src/sys/compat/sunos/syscalls.master cvs rdiff -u -r1.92 -r1.93 src/sys/compat/sunos/sunos_syscalls.c cvs rdiff -u -r1.88 -r1.89 src/sys/compat/sunos/sunos_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: kamil Date: Tue Dec 19 18:20:12 UTC 2017 Modified Files: src/sys/compat/ultrix: syscalls.master ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: compat/ultrix: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/compat/ultrix/syscalls.master cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.64 -r1.65 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.68 -r1.69 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.71 -r1.72 src/sys/compat/ultrix/ultrix_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/ultrix
Module Name:src
Committed By: kamil
Date: Tue Dec 19 18:20:12 UTC 2017
Modified Files:
src/sys/compat/ultrix: syscalls.master ultrix_syscall.h
ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c
Log Message:
compat/ultrix: Drop SYS_sbrk
sbrk - change data segment size
This syscall is dummy since the inception of the project.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/ultrix/syscalls.master
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscall.h
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/ultrix/ultrix_syscallargs.h
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/ultrix/ultrix_syscalls.c
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/ultrix/ultrix_sysent.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/compat/ultrix/syscalls.master
diff -u src/sys/compat/ultrix/syscalls.master:1.53 src/sys/compat/ultrix/syscalls.master:1.54
--- src/sys/compat/ultrix/syscalls.master:1.53 Tue Dec 19 08:23:22 2017
+++ src/sys/compat/ultrix/syscalls.master Tue Dec 19 18:20:11 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp $
+ $NetBSD: syscalls.master,v 1.54 2017/12/19 18:20:11 kamil Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -118,7 +118,7 @@
66 NOARGS { int|sys||vfork(void); }
67 OBSOL vread
68 OBSOL vwrite
-69 NOARGS { int|sys||sbrk(intptr_t incr); }
+69 OBSOL sbrk
70 OBSOL sstk
71 STD { int|ultrix_sys||mmap(void *addr, size_t len, \
int prot, u_int flags, int fd, long pos); }
Index: src/sys/compat/ultrix/ultrix_syscall.h
diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.69 src/sys/compat/ultrix/ultrix_syscall.h:1.70
--- src/sys/compat/ultrix/ultrix_syscall.h:1.69 Tue Dec 19 08:23:22 2017
+++ src/sys/compat/ultrix/ultrix_syscall.h Tue Dec 19 18:20:11 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscall.h,v 1.69 2017/12/19 08:23:22 kamil Exp $ */
+/* $NetBSD: ultrix_syscall.h,v 1.70 2017/12/19 18:20:11 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp
*/
#ifndef _ULTRIX_SYS_SYSCALL_H_
@@ -156,9 +156,7 @@
/* 67 is obsolete vread */
/* 68 is obsolete vwrite */
-/* syscall: "sbrk" ret: "int" args: "intptr_t" */
-#define ULTRIX_SYS_sbrk 69
-
+/* 69 is obsolete sbrk */
/* 70 is obsolete sstk */
/* syscall: "mmap" ret: "int" args: "void *" "size_t" "int" "u_int" "int" "long" */
#define ULTRIX_SYS_mmap 71
Index: src/sys/compat/ultrix/ultrix_syscallargs.h
diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.64 src/sys/compat/ultrix/ultrix_syscallargs.h:1.65
--- src/sys/compat/ultrix/ultrix_syscallargs.h:1.64 Tue Dec 19 08:23:22 2017
+++ src/sys/compat/ultrix/ultrix_syscallargs.h Tue Dec 19 18:20:11 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscallargs.h,v 1.64 2017/12/19 08:23:22 kamil Exp $ */
+/* $NetBSD: ultrix_syscallargs.h,v 1.65 2017/12/19 18:20:11 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp
*/
#ifndef _ULTRIX_SYS_SYSCALLARGS_H_
@@ -145,8 +145,6 @@ struct sys_chroot_args;
struct compat_43_sys_fstat_args;
-struct sys_sbrk_args;
-
struct ultrix_sys_mmap_args {
syscallarg(void *) addr;
syscallarg(size_t) len;
@@ -524,8 +522,6 @@ int compat_43_sys_getpagesize(struct lwp
int sys_vfork(struct lwp *, const void *, register_t *);
-int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-
int ultrix_sys_mmap(struct lwp *, const struct ultrix_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/ultrix/ultrix_syscalls.c
diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.68 src/sys/compat/ultrix/ultrix_syscalls.c:1.69
--- src/sys/compat/ultrix/ultrix_syscalls.c:1.68 Tue Dec 19 08:23:22 2017
+++ src/sys/compat/ultrix/ultrix_syscalls.c Tue Dec 19 18:20:11 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: ultrix_syscalls.c,v 1.68 2017/12/19 08:23:22 kamil Exp $ */
+/* $NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.52 2013/11/07 19:37:19 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.53 2017/12/19 08:23:22 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.68 2017/12/19 08:23:22 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.69 2017/12/19 18:20:11 kamil Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -92,7 +92,7 @@
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kamil Date: Tue Dec 19 18:15:08 UTC 2017 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master Log Message: compat/freebsd: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.88 -r1.89 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.69 -r1.70 src/sys/compat/freebsd/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: kamil
Date: Tue Dec 19 18:15:08 UTC 2017
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c syscalls.master
Log Message:
compat/freebsd: Drop SYS_sbrk
sbrk - change data segment size
This syscall is dummy since the inception of the project.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/freebsd/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/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.85 src/sys/compat/freebsd/freebsd_syscall.h:1.86
--- src/sys/compat/freebsd/freebsd_syscall.h:1.85 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_syscall.h Tue Dec 19 18:15:08 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.85 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.86 2017/12/19 18:15:08 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
+ * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -217,9 +217,7 @@
/* 67 is obsolete vread */
/* 68 is obsolete vwrite */
-/* syscall: "sbrk" ret: "int" args: "intptr_t" */
-#define FREEBSD_SYS_sbrk 69
-
+/* 69 is obsolete sbrk */
/* 70 is obsolete sstk */
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define FREEBSD_SYS_ommap 71
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.88 src/sys/compat/freebsd/freebsd_syscallargs.h:1.89
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.88 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Tue Dec 19 18:15:08 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
+ * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -165,8 +165,6 @@ struct freebsd_sys_msync_args {
};
check_syscall_args(freebsd_sys_msync)
-struct sys_sbrk_args;
-
struct compat_43_sys_mmap_args;
struct sys_ovadvise_args;
@@ -738,8 +736,6 @@ int freebsd_sys_msync(struct lwp *, cons
int sys_vfork(struct lwp *, const void *, register_t *);
-int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.88 src/sys/compat/freebsd/freebsd_sysent.c:1.89
--- src/sys/compat/freebsd/freebsd_sysent.c:1.88 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_sysent.c Tue Dec 19 18:15:08 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
+ * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -340,9 +340,8 @@ struct sysent freebsd_sysent[] = {
.sy_call = sys_nosys,
}, /* 68 = filler */
{
- ns(struct sys_sbrk_args),
- .sy_call = (sy_call_t *)sys_sbrk
- }, /* 69 = sbrk */
+ .sy_call = sys_nosys,
+ }, /* 69 = filler */
{
.sy_call = sys_nosys,
}, /* 70 = filler */
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.86 src/sys/compat/freebsd/freebsd_syscalls.c:1.87
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.86 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_syscalls.c Tue Dec 19 18:15:08 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.86 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.87 2017/12/19
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: kamil Date: Tue Dec 19 18:10:22 UTC 2017 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c syscalls.master Log Message: compat/aoutm68k: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. It's implemented in userland in libc. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.47 -r1.48 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.46 -r1.47 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.51 -r1.52 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.38 -r1.39 src/sys/compat/aoutm68k/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: kamil Date: Tue Dec 19 18:10:22 UTC 2017 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c syscalls.master Log Message: compat/aoutm68k: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. It's implemented in userland in libc. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.47 -r1.48 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.46 -r1.47 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.51 -r1.52 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.38 -r1.39 src/sys/compat/aoutm68k/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/aoutm68k/aoutm68k_syscall.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.49 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.50 --- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.49 Tue Dec 19 08:09:36 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Tue Dec 19 18:10:22 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscall.h,v 1.49 2017/12/19 08:09:36 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscall.h,v 1.50 2017/12/19 18:10:22 kamil Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #ifndef _AOUTM68K_SYS_SYSCALL_H_ @@ -264,9 +264,7 @@ /* 67 is obsolete vread */ /* 68 is obsolete vwrite */ -/* syscall: "sbrk" ret: "int" args: "intptr_t" */ -#define AOUTM68K_SYS_sbrk 69 - +/* 69 is obsolete sbrk */ /* 70 is obsolete sstk */ #if defined(COMPAT_43) || !defined(_KERNEL) /* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */ Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.47 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.48 --- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.47 Tue Dec 19 08:09:36 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Tue Dec 19 18:10:22 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscallargs.h,v 1.47 2017/12/19 08:09:36 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscallargs.h,v 1.48 2017/12/19 18:10:22 kamil Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #ifndef _AOUTM68K_SYS_SYSCALLARGS_H_ @@ -189,8 +189,6 @@ struct compat_43_sys_getkerninfo_args; struct compat_12_sys_msync_args; #else #endif - -struct sys_sbrk_args; #if defined(COMPAT_43) || !defined(_KERNEL) struct compat_43_sys_mmap_args; @@ -820,8 +818,6 @@ int compat_12_sys_msync(struct lwp *, co #endif int sys_vfork(struct lwp *, const void *, register_t *); -int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *); - #if defined(COMPAT_43) || !defined(_KERNEL) int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *); Index: src/sys/compat/aoutm68k/aoutm68k_syscalls.c diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.46 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.47 --- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.46 Tue Dec 19 08:09:36 2017 +++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Tue Dec 19 18:10:22 2017 @@ -1,14 +1,14 @@ -/* $NetBSD: aoutm68k_syscalls.c,v 1.46 2017/12/19 08:09:36 kamil Exp $ */ +/* $NetBSD: aoutm68k_syscalls.c,v 1.47 2017/12/19 18:10:22 kamil Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp + * created from NetBSD: syscalls.master,v 1.38 2017/12/19 08:09:36 kamil Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.46 2017/12/19 08:09:36 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.47 2017/12/19 18:10:22 kamil Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -151,7 +151,7 @@ const char *const aoutm68k_syscallnames[ /* 66 */ "vfork", /* 67 */ "#67 (obsolete vread)", /* 68 */ "#68 (obsolete vwrite)", - /* 69 */ "sbrk", + /* 69 */ "#69 (obsolete sbrk)", /* 70 */ "#70 (obsolete sstk)", #if defined(COMPAT_43) || !defined(_KERNEL) /* 71 */ "ommap", @@ -898,7 +898,7 @@ const char *const altaoutm68k_syscallnam /* 66 */ NULL, /* vfork */ /* 67 */ NULL, /* obsolete vread */ /* 68 */ NULL, /* obsolete vwrite */ - /* 69 */ NULL, /* sbrk */ + /* 69 */ NULL, /* obsolete sbrk */ /* 70 */ NULL, /* obsolete sstk */ #if
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kamil Date: Tue Dec 19 08:27:05 UTC 2017 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master Log Message: compat freebsd: Drop the sstk(2) syscall sstk(2) has never been implemented by the NetBSD kernel. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.68 -r1.69 src/sys/compat/freebsd/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: kamil
Date: Tue Dec 19 08:27:05 UTC 2017
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c syscalls.master
Log Message:
compat freebsd: Drop the sstk(2) syscall
sstk(2) has never been implemented by the NetBSD kernel.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/freebsd/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/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.84 src/sys/compat/freebsd/freebsd_syscall.h:1.85
--- src/sys/compat/freebsd/freebsd_syscall.h:1.84 Wed May 10 06:19:48 2017
+++ src/sys/compat/freebsd/freebsd_syscall.h Tue Dec 19 08:27:05 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.84 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.85 2017/12/19 08:27:05 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2013/11/07 19:37:18 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -220,9 +220,7 @@
/* syscall: "sbrk" ret: "int" args: "intptr_t" */
#define FREEBSD_SYS_sbrk 69
-/* syscall: "sstk" ret: "int" args: "int" */
-#define FREEBSD_SYS_sstk 70
-
+/* 70 is obsolete sstk */
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define FREEBSD_SYS_ommap 71
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.87 src/sys/compat/freebsd/freebsd_syscallargs.h:1.88
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.87 Wed May 10 06:19:48 2017
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Tue Dec 19 08:27:05 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.87 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2013/11/07 19:37:18 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -167,8 +167,6 @@ check_syscall_args(freebsd_sys_msync)
struct sys_sbrk_args;
-struct sys_sstk_args;
-
struct compat_43_sys_mmap_args;
struct sys_ovadvise_args;
@@ -742,8 +740,6 @@ int sys_vfork(struct lwp *, const void *
int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-int sys_sstk(struct lwp *, const struct sys_sstk_args *, register_t *);
-
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.87 src/sys/compat/freebsd/freebsd_sysent.c:1.88
--- src/sys/compat/freebsd/freebsd_sysent.c:1.87 Tue Aug 8 08:04:06 2017
+++ src/sys/compat/freebsd/freebsd_sysent.c Tue Dec 19 08:27:05 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_sysent.c,v 1.87 2017/08/08 08:04:06 maxv Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2013/11/07 19:37:18 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.87 2017/08/08 08:04:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -344,9 +344,8 @@ struct sysent freebsd_sysent[] = {
.sy_call = (sy_call_t *)sys_sbrk
}, /* 69 = sbrk */
{
- ns(struct sys_sstk_args),
- .sy_call = (sy_call_t *)sys_sstk
- }, /* 70 = sstk */
+ .sy_call = sys_nosys,
+ }, /* 70 = filler */
{
ns(struct compat_43_sys_mmap_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.85 src/sys/compat/freebsd/freebsd_syscalls.c:1.86
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.85 Tue Aug 8 08:04:06 2017
+++ src/sys/compat/freebsd/freebsd_syscalls.c Tue Dec 19 08:27:05 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.85 2017/08/08 08:04:06 maxv Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.86 2017/12/19 08:27:05
CVS commit: src/sys/compat/sunos
Module Name:src Committed By: kamil Date: Tue Dec 19 08:25:37 UTC 2017 Modified Files: src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c syscalls.master Log Message: compat sunos: Drop the sstk(2) syscall sstk(2) has never been implemented by the NetBSD kernel. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/compat/sunos/sunos_syscall.h cvs rdiff -u -r1.76 -r1.77 src/sys/compat/sunos/sunos_syscallargs.h \ src/sys/compat/sunos/syscalls.master cvs rdiff -u -r1.91 -r1.92 src/sys/compat/sunos/sunos_syscalls.c cvs rdiff -u -r1.87 -r1.88 src/sys/compat/sunos/sunos_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos
Module Name:src
Committed By: kamil
Date: Tue Dec 19 08:25:37 UTC 2017
Modified Files:
src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h
sunos_syscalls.c sunos_sysent.c syscalls.master
Log Message:
compat sunos: Drop the sstk(2) syscall
sstk(2) has never been implemented by the NetBSD kernel.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/sunos/sunos_syscallargs.h \
src/sys/compat/sunos/syscalls.master
cvs rdiff -u -r1.91 -r1.92 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/sunos/sunos_sysent.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/compat/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.92 src/sys/compat/sunos/sunos_syscall.h:1.93
--- src/sys/compat/sunos/sunos_syscall.h:1.92 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos/sunos_syscall.h Tue Dec 19 08:25:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_syscall.h,v 1.92 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.93 2017/12/19 08:25:37 kamil Exp $ */
/*
* System call numbers.
@@ -159,9 +159,7 @@
/* syscall: "sbrk" ret: "int" args: "intptr_t" */
#define SUNOS_SYS_sbrk 69
-/* syscall: "sstk" ret: "int" args: "int" */
-#define SUNOS_SYS_sstk 70
-
+/* 70 is obsolete sstk */
/* syscall: "mmap" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" */
#define SUNOS_SYS_mmap 71
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.76 src/sys/compat/sunos/sunos_syscallargs.h:1.77
--- src/sys/compat/sunos/sunos_syscallargs.h:1.76 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos/sunos_syscallargs.h Tue Dec 19 08:25:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.76 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.77 2017/12/19 08:25:37 kamil Exp $ */
/*
* System call argument lists.
@@ -169,8 +169,6 @@ check_syscall_args(sunos_sys_omsync)
struct sys_sbrk_args;
-struct sys_sstk_args;
-
struct sunos_sys_mmap_args {
syscallarg(void *) addr;
syscallarg(size_t) len;
@@ -556,8 +554,6 @@ int sys_vfork(struct lwp *, const void *
int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-int sys_sstk(struct lwp *, const struct sys_sstk_args *, register_t *);
-
int sunos_sys_mmap(struct lwp *, const struct sunos_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/sunos/syscalls.master
diff -u src/sys/compat/sunos/syscalls.master:1.76 src/sys/compat/sunos/syscalls.master:1.77
--- src/sys/compat/sunos/syscalls.master:1.76 Thu Nov 7 19:37:19 2013
+++ src/sys/compat/sunos/syscalls.master Tue Dec 19 08:25:37 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.76 2013/11/07 19:37:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.77 2017/12/19 08:25:37 kamil Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -129,7 +129,7 @@
67 OBSOL vread
68 OBSOL vwrite
69 NOARGS { int|sys||sbrk(intptr_t incr); }
-70 NOARGS { int|sys||sstk(int incr); }
+70 OBSOL sstk
71 STD { void *|sunos_sys||mmap(void *addr, size_t len, \
int prot, int flags, int fd, long pos); }
72 NOARGS { int|sys||ovadvise(int anom); } vadvise
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.91 src/sys/compat/sunos/sunos_syscalls.c:1.92
--- src/sys/compat/sunos/sunos_syscalls.c:1.91 Wed May 10 06:19:49 2017
+++ src/sys/compat/sunos/sunos_syscalls.c Tue Dec 19 08:25:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_syscalls.c,v 1.91 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.92 2017/12/19 08:25:37 kamil Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.91 2017/05/10 06:19:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.92 2017/12/19 08:25:37 kamil Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -98,7 +98,7 @@ const char *const sunos_syscallnames[] =
/* 67 */ "#67 (obsolete vread)",
/* 68 */ "#68 (obsolete vwrite)",
/* 69 */ "sbrk",
- /* 70 */ "sstk",
+ /* 70 */ "#70 (obsolete sstk)",
/* 71 */ "mmap",
/* 72 */ "vadvise",
/* 73 */ "munmap",
@@ -371,7 +371,7 @@ const char *const altsunos_syscallnames[
/* 67 */ NULL, /* obsolete vread */
/* 68 */ NULL, /* obsolete vwrite */
/* 69 */ NULL, /* sbrk */
- /* 70 */ NULL, /* sstk */
+ /* 70 */ NULL, /* obsolete sstk */
/* 71 */ NULL, /* mmap */
/* 72 */ "ovadvise",
/* 73 */ NULL, /* munmap */
Index: src/sys/compat/sunos/sunos_sysent.c
diff -u src/sys/compat/sunos/sunos_sysent.c:1.87 src/sys/compat/sunos/sunos_sysent.c:1.88
--- src/sys/compat/sunos/sunos_sysent.c:1.87 Wed May
