CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Aug 20 09:55:49 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_drm.c Log Message: add NetBSD copyright. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_drm.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: Tue Aug 20 09:55:49 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_drm.c Log Message: add NetBSD copyright. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_drm.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_drm.c diff -u src/sys/compat/netbsd32/netbsd32_drm.c:1.1 src/sys/compat/netbsd32/netbsd32_drm.c:1.2 --- src/sys/compat/netbsd32/netbsd32_drm.c:1.1 Tue Aug 20 05:32:21 2019 +++ src/sys/compat/netbsd32/netbsd32_drm.c Tue Aug 20 05:55:49 2019 @@ -1,6 +1,9 @@ -/* $NetBSD: netbsd32_drm.c,v 1.1 2019/08/20 09:32:21 christos Exp $ */ +/* $NetBSD: netbsd32_drm.c,v 1.2 2019/08/20 09:55:49 christos Exp $ */ /* + * Copyright (c) 2019 The NetBSD Foundation, Inc. + * All rights reserved. + * * This code was written by Surya Shankar for GSoC 2019. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_drm.c,v 1.1 2019/08/20 09:32:21 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_drm.c,v 1.2 2019/08/20 09:55:49 christos Exp $"); #include #include
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Tue Aug 20 09:32:21 UTC 2019
Modified Files:
src/sys/compat/netbsd32: files.netbsd32 netbsd32_ioctl.c
netbsd32_ioctl.h
Added Files:
src/sys/compat/netbsd32: netbsd32_drm.c
Log Message:
compat32 drm ioctl support from Surya Shankar at GSoC 2019
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_drm.c
cvs rdiff -u -r1.103 -r1.104 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.67 -r1.68 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/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.45 src/sys/compat/netbsd32/files.netbsd32:1.46
--- src/sys/compat/netbsd32/files.netbsd32:1.45 Mon Jun 17 21:36:50 2019
+++ src/sys/compat/netbsd32/files.netbsd32 Tue Aug 20 05:32:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.45 2019/06/18 01:36:50 christos Exp $
+# $NetBSD: files.netbsd32,v 1.46 2019/08/20 09:32:21 christos Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -7,10 +7,14 @@
# own file lists.
define compat_netbsd32
+
+makeoptions drmkms CPPFLAGS+="-DNETBSD32_DRMKMS"
+
file compat/netbsd32/netbsd32_core.c compat_netbsd32 & coredump
file compat/netbsd32/netbsd32_exec_elf32.c compat_netbsd32 & exec_elf32
file compat/netbsd32/netbsd32_exec_aout.c compat_netbsd32 & exec_aout
file compat/netbsd32/netbsd32_netbsd.c compat_netbsd32
+file compat/netbsd32/netbsd32_drm.c compat_netbsd32 & drmkms
file compat/netbsd32/netbsd32_event.c compat_netbsd32
file compat/netbsd32/netbsd32_execve.c compat_netbsd32
file compat/netbsd32/netbsd32_fd.c compat_netbsd32
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.103 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.104
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.103 Fri May 17 03:37:12 2019
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Tue Aug 20 05:32:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.103 2019/05/17 07:37:12 msaitoh Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.104 2019/08/20 09:32:21 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.103 2019/05/17 07:37:12 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.104 2019/08/20 09:32:21 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -1517,6 +1517,12 @@ netbsd32_ioctl(struct lwp *l,
IOCTL_STRUCT_CONV_TO(DIOCLWEDGES, dkwedge_list);
default:
+#ifdef NETBSD32_DRMKMS
+ if (IOCGROUP(com) == 'd') {
+ error = netbsd32_drm_ioctl(fp, com, data32, l);
+ break;
+ }
+#endif
#ifdef NETBSD32_MD_IOCTL
error = netbsd32_md_ioctl(fp, com, data32, l);
#else
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.67 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.68
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.67 Fri May 17 03:37:12 2019
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Tue Aug 20 05:32:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.67 2019/05/17 07:37:12 msaitoh Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.68 2019/08/20 09:32:21 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -36,6 +36,9 @@
#include
#include
+#include
+#include
+#include
#include
/* we define some handy macros here... */
@@ -624,3 +627,5 @@ struct netbsd32_disk_strategy {
#define DIOCGSTRATEGY32 _IOR('d', 125, struct netbsd32_disk_strategy)
#define DIOCSSTRATEGY32 _IOW('d', 126, struct netbsd32_disk_strategy)
+
+int netbsd32_drm_ioctl(struct file *, unsigned long, void *, struct lwp *);
Added files:
Index: src/sys/compat/netbsd32/netbsd32_drm.c
diff -u /dev/null src/sys/compat/netbsd32/netbsd32_drm.c:1.1
--- /dev/null Tue Aug 20 05:32:21 2019
+++ src/sys/compat/netbsd32/netbsd32_drm.c Tue Aug 20 05:32:21 2019
@@ -0,0 +1,974 @@
+/* $NetBSD: netbsd32_drm.c,v 1.1 2019/08/20 09:32:21 christos Exp $ */
+
+/*
+ * This code was written by Surya Shankar for GSoC 2019.
+ *
+ * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Aug 20 09:32:21 UTC 2019 Modified Files: src/sys/compat/netbsd32: files.netbsd32 netbsd32_ioctl.c netbsd32_ioctl.h Added Files: src/sys/compat/netbsd32: netbsd32_drm.c Log Message: compat32 drm ioctl support from Surya Shankar at GSoC 2019 To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/compat/netbsd32/files.netbsd32 cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_drm.c cvs rdiff -u -r1.103 -r1.104 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.67 -r1.68 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/sunos
Module Name:src
Committed By: dholland
Date: Wed Jul 3 18:24:50 UTC 2019
Modified Files:
src/sys/compat/sunos: sunos_misc.c
Log Message:
Stack buffers mustn't escape their scope. PR 54326 from David Binderman
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/compat/sunos/sunos_misc.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_misc.c
diff -u src/sys/compat/sunos/sunos_misc.c:1.172 src/sys/compat/sunos/sunos_misc.c:1.173
--- src/sys/compat/sunos/sunos_misc.c:1.172 Mon Sep 3 16:29:30 2018
+++ src/sys/compat/sunos/sunos_misc.c Wed Jul 3 18:24:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_misc.c,v 1.172 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: sunos_misc.c,v 1.173 2019/07/03 18:24:50 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.172 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.173 2019/07/03 18:24:50 dholland Exp $");
#include
#include
@@ -1013,6 +1013,7 @@ sunos_sys_reboot(struct lwp *l, const st
struct sunos_howto_conv *convp;
int error, bsd_howto, sun_howto;
char *bootstr;
+ char bs[128];
if ((error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_REBOOT,
0, NULL, NULL, NULL)) != 0)
@@ -1036,8 +1037,6 @@ sunos_sys_reboot(struct lwp *l, const st
* next booted kernel.
*/
if (sun_howto & SUNOS_RB_STRING) {
- char bs[128];
-
error = copyinstr(SCARG(uap, bootstr), bs, sizeof(bs), 0);
if (error)
CVS commit: src/sys/compat/sunos
Module Name:src Committed By: dholland Date: Wed Jul 3 18:24:50 UTC 2019 Modified Files: src/sys/compat/sunos: sunos_misc.c Log Message: Stack buffers mustn't escape their scope. PR 54326 from David Binderman To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/compat/sunos/sunos_misc.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: christos
Date: Sun Jun 30 14:37:33 UTC 2019
Modified Files:
src/sys/compat/sys: sigtypes.h ucontext.h
Log Message:
This code is used in 32 bit arm emulations so always expose the stack32_t
and the 32 bit machine context structure definition and types.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/sigtypes.h
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/sys/ucontext.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/sigtypes.h
diff -u src/sys/compat/sys/sigtypes.h:1.3 src/sys/compat/sys/sigtypes.h:1.4
--- src/sys/compat/sys/sigtypes.h:1.3 Wed Jun 26 21:58:49 2019
+++ src/sys/compat/sys/sigtypes.h Sun Jun 30 10:37:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sigtypes.h,v 1.3 2019/06/27 01:58:49 christos Exp $ */
+/* $NetBSD: sigtypes.h,v 1.4 2019/06/30 14:37:33 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -63,7 +63,7 @@ struct sigaltstack13 {
#endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || ... */
-#if defined(_LP64) && defined(_KERNEL)
+#ifdef _KERNEL
struct __sigaltstack32 {
uint32_t ss_sp;
@@ -73,7 +73,7 @@ struct __sigaltstack32 {
typedef struct __sigaltstack32 stack32_t;
-#endif /* _LP64 && _KERNEL */
+#endif /* _KERNEL */
#endif /* !_COMPAT_SYS_SIGTYPES_H_ */
Index: src/sys/compat/sys/ucontext.h
diff -u src/sys/compat/sys/ucontext.h:1.7 src/sys/compat/sys/ucontext.h:1.8
--- src/sys/compat/sys/ucontext.h:1.7 Wed Jun 26 21:58:49 2019
+++ src/sys/compat/sys/ucontext.h Sun Jun 30 10:37:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ucontext.h,v 1.7 2019/06/27 01:58:49 christos Exp $ */
+/* $NetBSD: ucontext.h,v 1.8 2019/06/30 14:37:33 christos Exp $ */
/*-
* Copyright (c) 1999, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
-#if defined(_LP64) && defined(_KERNEL)
+#ifdef _KERNEL
typedef struct __ucontext32 ucontext32_t;
@@ -61,6 +61,6 @@ int cpu_mcontext32_validate(struct lwp *
void cpu_getmcontext32(struct lwp *, mcontext32_t *, unsigned int *);
int cpu_setmcontext32(struct lwp *, const mcontext32_t *, unsigned int);
-#endif /* _LP64 && _KERNEL */
+#endif /* _KERNEL */
#endif /* !_COMPAT_SYS_UCONTEXT_H_ */
CVS commit: src/sys/compat/sys
Module Name:src Committed By: christos Date: Sun Jun 30 14:37:33 UTC 2019 Modified Files: src/sys/compat/sys: sigtypes.h ucontext.h Log Message: This code is used in 32 bit arm emulations so always expose the stack32_t and the 32 bit machine context structure definition and types. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/sigtypes.h cvs rdiff -u -r1.7 -r1.8 src/sys/compat/sys/ucontext.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: martin Date: Sun Jun 30 08:49:21 UTC 2019 Modified Files: src/sys/compat/sys: siginfo.h Log Message: Provide the compat structures even if not building 64bit kernels, as we have same-bitness netbsd32 emulations for different ABIs on some architectures. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/siginfo.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: martin
Date: Sun Jun 30 08:49:21 UTC 2019
Modified Files:
src/sys/compat/sys: siginfo.h
Log Message:
Provide the compat structures even if not building 64bit kernels, as
we have same-bitness netbsd32 emulations for different ABIs on some
architectures.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/siginfo.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/siginfo.h
diff -u src/sys/compat/sys/siginfo.h:1.6 src/sys/compat/sys/siginfo.h:1.7
--- src/sys/compat/sys/siginfo.h:1.6 Thu Jun 27 01:58:49 2019
+++ src/sys/compat/sys/siginfo.h Sun Jun 30 08:49:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.6 2019/06/27 01:58:49 christos Exp $ */
+/* $NetBSD: siginfo.h,v 1.7 2019/06/30 08:49:21 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _COMPAT_SYS_SIGINFO_H_
#define _COMPAT_SYS_SIGINFO_H_
-#if defined(_LP64) && defined(_KERNEL)
+#ifdef _KERNEL
typedef union sigval32 {
int sival_int;
@@ -83,6 +83,6 @@ typedef union siginfo32 {
struct __ksiginfo32 _info;
} siginfo32_t;
-#endif /* _LP64 && _KERNEL */
+#endif /* _KERNEL */
#endif /* !_COMPAT_SYS_SIGINFO_H_ */
Re: CVS commit: src/sys/compat/sys
On Fri, Jun 28, 2019 at 05:03:37AM -0700, Jason Thorpe wrote: > > > On Jun 26, 2019, at 7:10 PM, matthew green wrote: > > > >> Always include the 32 bit structure and definitions on _LP64 regardless > >> of compat32 being on or off, because we want the headers to work when > >> compiling modular kernels. Of course the 32 bit structs do not make sense > >> on platforms that don't have 32 bit modes (alpha), but we don't have > >> a define for that and it does not hurt. > > > > i've been using _LP64 && !__alpha__ for this when it strikes. > > > > sub-optimal, but also easy to grep and find :-) > > Perhaps we should define "_LP64_ONLY" in for this type of > situation? > I'm a really huge fan of keeping structs the same across archs when it doesn't cost us very much. It's been a real blessing that netbsd is mostly consistent when porting programming languages, which often end up embedding a list of structs and their sizes, generated by very fragile code (or by hand!)
Re: CVS commit: src/sys/compat/sys
> On Jun 26, 2019, at 7:10 PM, matthew green wrote: > >> Always include the 32 bit structure and definitions on _LP64 regardless >> of compat32 being on or off, because we want the headers to work when >> compiling modular kernels. Of course the 32 bit structs do not make sense >> on platforms that don't have 32 bit modes (alpha), but we don't have >> a define for that and it does not hurt. > > i've been using _LP64 && !__alpha__ for this when it strikes. > > sub-optimal, but also easy to grep and find :-) Perhaps we should define "_LP64_ONLY" in for this type of situation? -- thorpej
re: CVS commit: src/sys/compat/sys
> Always include the 32 bit structure and definitions on _LP64 regardless > of compat32 being on or off, because we want the headers to work when > compiling modular kernels. Of course the 32 bit structs do not make sense > on platforms that don't have 32 bit modes (alpha), but we don't have > a define for that and it does not hurt. i've been using _LP64 && !__alpha__ for this when it strikes. sub-optimal, but also easy to grep and find :-) .mrg.
CVS commit: src/sys/compat/sys
Module Name:src Committed By: christos Date: Thu Jun 27 02:44:54 UTC 2019 Modified Files: src/sys/compat/sys: rnd.h Log Message: This actually needs the netbsd32 stuff present since the struct for the 32 bit syscall has a netbsd32_voidp... This header is used also for compat/common, so just revert (helped us to fix a bug though :-) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/rnd.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: christos
Date: Thu Jun 27 02:44:54 UTC 2019
Modified Files:
src/sys/compat/sys: rnd.h
Log Message:
This actually needs the netbsd32 stuff present since the struct for the
32 bit syscall has a netbsd32_voidp... This header is used also for
compat/common, so just revert (helped us to fix a bug though :-)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/rnd.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/rnd.h
diff -u src/sys/compat/sys/rnd.h:1.6 src/sys/compat/sys/rnd.h:1.7
--- src/sys/compat/sys/rnd.h:1.6 Wed Jun 26 21:58:49 2019
+++ src/sys/compat/sys/rnd.h Wed Jun 26 22:44:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.h,v 1.6 2019/06/27 01:58:49 christos Exp $ */
+/* $NetBSD: rnd.h,v 1.7 2019/06/27 02:44:54 christos Exp $ */
/*-
* Copyright (c) 1997,2011 The NetBSD Foundation, Inc.
@@ -33,9 +33,18 @@
#ifndef _COMPAT_SYS_RND_H_
#define _COMPAT_SYS_RND_H_
+#if defined(_KERNEL_OPT)
+#include "opt_compat_netbsd.h"
+#include "opt_compat_netbsd32.h"
+#endif
+
#include
#include
+#ifdef COMPAT_NETBSD32
+#include
+#endif /* COMPAT_NETBSD32 */
+
#include
/*
@@ -57,7 +66,7 @@ typedef struct {
void *unused_state; /* was: internal state */
} rndsource50_t;
-#ifdef _LP64
+#ifdef COMPAT_NETBSD32
typedef struct {
char name[16]; /* device name */
uint32_t unused_time; /* was: last time recorded */
@@ -68,7 +77,7 @@ typedef struct {
uint32_t flags; /* flags */
netbsd32_voidp unused_state; /* was: internal state */
} rndsource50_32_t;
-#endif /* _LP64 */
+#endif /* COMPAT_NETBSD32 */
/*
* NetBSD-5 defined RND_MAXSTATCOUNT as 10. We define RND_MAXSTATCOUNT50
@@ -88,13 +97,13 @@ typedef struct {
rndsource50_t source[RND_MAXSTATCOUNT50];
} rndstat50_t;
-#ifdef _LP64
+#ifdef COMPAT_NETBSD32
typedef struct {
uint32_t start;
uint32_t count;
rndsource50_32_t source[RND_MAXSTATCOUNT50];
} rndstat50_32_t;
-#endif /* _LP64 */
+#endif /* COMPAT_NETBSD32 */
/*
* return information on a specific source by name
@@ -104,12 +113,12 @@ typedef struct {
rndsource50_t source;
} rndstat_name50_t;
-#ifdef _LP64
+#ifdef COMPAT_NETBSD32
typedef struct {
char name[16];
rndsource50_32_t source;
} rndstat_name50_32_t;
-#endif /* _LP64 */
+#endif /* COMPAT_NETBSD32 */
/*
* NetBSD-5 defined RND_POOLWORDS as 128. In NetBSD-6, the value
@@ -134,9 +143,9 @@ int compat32_50_rnd_ioctl(struct file *,
#define RNDGETSRCNUM50 _IOWR('R', 102, rndstat50_t)
#define RNDGETSRCNAME50 _IOWR('R', 103, rndstat_name50_t)
-#ifdef _LP64
+#ifdef COMPAT_NETBSD32
#define RNDGETSRCNUM50_32 _IOWR('R', 102, rndstat50_32_t)
#define RNDGETSRCNAME50_32 _IOWR('R', 103, rndstat_name50_32_t)
-#endif
+#endif /* COMPAT_NETBSD32 */
#endif /* !_COMPAT_SYS_RND_H_ */
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Thu Jun 27 02:36:27 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_rndpseudo_50.c Log Message: Include the right stuff so compat_netbsd32_50 compiles. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_rndpseudo_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/netbsd32/netbsd32_compat_50.c diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.38 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.39 --- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.38 Tue Jun 18 18:34:25 2019 +++ src/sys/compat/netbsd32/netbsd32_compat_50.c Wed Jun 26 22:36:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_50.c,v 1.38 2019/06/18 22:34:25 kamil Exp $ */ +/* $NetBSD: netbsd32_compat_50.c,v 1.39 2019/06/27 02:36:27 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,10 +36,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.38 2019/06/18 22:34:25 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.39 2019/06/27 02:36:27 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" +#include "opt_compat_netbsd32.h" #include "opt_ntp.h" #include "opt_quota.h" #endif Index: src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c diff -u src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c:1.2 src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c:1.3 --- src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c:1.2 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c Wed Jun 26 22:36:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_rndpseudo_50.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_rndpseudo_50.c,v 1.3 2019/06/27 02:36:27 christos Exp $ */ /*- * Copyright (c) 1997-2011 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_rndpseudo_50.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_rndpseudo_50.c,v 1.3 2019/06/27 02:36:27 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -41,6 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_rnd #include #include + +#include #include /*
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Thu Jun 27 02:36:27 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_rndpseudo_50.c Log Message: Include the right stuff so compat_netbsd32_50 compiles. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_rndpseudo_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: christos
Date: Thu Jun 27 01:58:49 UTC 2019
Modified Files:
src/sys/compat/sys: rnd.h siginfo.h sigtypes.h ttycom.h ucontext.h
Log Message:
Always include the 32 bit structure and definitions on _LP64 regardless
of compat32 being on or off, because we want the headers to work when
compiling modular kernels. Of course the 32 bit structs do not make sense
on platforms that don't have 32 bit modes (alpha), but we don't have
a define for that and it does not hurt.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sys/rnd.h \
src/sys/compat/sys/siginfo.h
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/sys/sigtypes.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/ttycom.h
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/ucontext.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/rnd.h
diff -u src/sys/compat/sys/rnd.h:1.5 src/sys/compat/sys/rnd.h:1.6
--- src/sys/compat/sys/rnd.h:1.5 Sat Jan 26 21:08:41 2019
+++ src/sys/compat/sys/rnd.h Wed Jun 26 21:58:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.h,v 1.5 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: rnd.h,v 1.6 2019/06/27 01:58:49 christos Exp $ */
/*-
* Copyright (c) 1997,2011 The NetBSD Foundation, Inc.
@@ -33,18 +33,9 @@
#ifndef _COMPAT_SYS_RND_H_
#define _COMPAT_SYS_RND_H_
-#if defined(_KERNEL_OPT)
-#include "opt_compat_netbsd.h"
-#include "opt_compat_netbsd32.h"
-#endif
-
#include
#include
-#ifdef COMPAT_NETBSD32
-#include
-#endif /* COMPAT_NETBSD32 */
-
#include
/*
@@ -66,7 +57,7 @@ typedef struct {
void *unused_state; /* was: internal state */
} rndsource50_t;
-#ifdef COMPAT_NETBSD32
+#ifdef _LP64
typedef struct {
char name[16]; /* device name */
uint32_t unused_time; /* was: last time recorded */
@@ -77,7 +68,7 @@ typedef struct {
uint32_t flags; /* flags */
netbsd32_voidp unused_state; /* was: internal state */
} rndsource50_32_t;
-#endif /* COMPAT_NETBSD32 */
+#endif /* _LP64 */
/*
* NetBSD-5 defined RND_MAXSTATCOUNT as 10. We define RND_MAXSTATCOUNT50
@@ -97,13 +88,13 @@ typedef struct {
rndsource50_t source[RND_MAXSTATCOUNT50];
} rndstat50_t;
-#ifdef COMPAT_NETBSD32
+#ifdef _LP64
typedef struct {
uint32_t start;
uint32_t count;
rndsource50_32_t source[RND_MAXSTATCOUNT50];
} rndstat50_32_t;
-#endif /* COMPAT_NETBSD32 */
+#endif /* _LP64 */
/*
* return information on a specific source by name
@@ -113,12 +104,12 @@ typedef struct {
rndsource50_t source;
} rndstat_name50_t;
-#ifdef COMPAT_NETBSD32
+#ifdef _LP64
typedef struct {
char name[16];
rndsource50_32_t source;
} rndstat_name50_32_t;
-#endif /* COMPAT_NETBSD32 */
+#endif /* _LP64 */
/*
* NetBSD-5 defined RND_POOLWORDS as 128. In NetBSD-6, the value
@@ -143,9 +134,9 @@ int compat32_50_rnd_ioctl(struct file *,
#define RNDGETSRCNUM50 _IOWR('R', 102, rndstat50_t)
#define RNDGETSRCNAME50 _IOWR('R', 103, rndstat_name50_t)
-#ifdef COMPAT_NETBSD32
+#ifdef _LP64
#define RNDGETSRCNUM50_32 _IOWR('R', 102, rndstat50_32_t)
#define RNDGETSRCNAME50_32 _IOWR('R', 103, rndstat_name50_32_t)
-#endif /* COMPAT_NETBSD32 */
+#endif
#endif /* !_COMPAT_SYS_RND_H_ */
Index: src/sys/compat/sys/siginfo.h
diff -u src/sys/compat/sys/siginfo.h:1.5 src/sys/compat/sys/siginfo.h:1.6
--- src/sys/compat/sys/siginfo.h:1.5 Wed Jun 19 12:14:07 2019
+++ src/sys/compat/sys/siginfo.h Wed Jun 26 21:58:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.5 2019/06/19 16:14:07 maya Exp $ */
+/* $NetBSD: siginfo.h,v 1.6 2019/06/27 01:58:49 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,11 +32,7 @@
#ifndef _COMPAT_SYS_SIGINFO_H_
#define _COMPAT_SYS_SIGINFO_H_
-#if defined(_KERNEL_OPT)
-#include "opt_compat_netbsd32.h"
-#endif
-
-#if defined(COMPAT_NETBSD32) && defined(_KERNEL)
+#if defined(_LP64) && defined(_KERNEL)
typedef union sigval32 {
int sival_int;
@@ -87,6 +83,6 @@ typedef union siginfo32 {
struct __ksiginfo32 _info;
} siginfo32_t;
-#endif /* COMPAT_NETBSD32 && _KERNEL */
+#endif /* _LP64 && _KERNEL */
#endif /* !_COMPAT_SYS_SIGINFO_H_ */
Index: src/sys/compat/sys/sigtypes.h
diff -u src/sys/compat/sys/sigtypes.h:1.2 src/sys/compat/sys/sigtypes.h:1.3
--- src/sys/compat/sys/sigtypes.h:1.2 Sun Dec 11 07:20:29 2005
+++ src/sys/compat/sys/sigtypes.h Wed Jun 26 21:58:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sigtypes.h,v 1.2 2005/12/11 12:20:29 christos Exp $ */
+/* $NetBSD: sigtypes.h,v 1.3 2019/06/27 01:58:49 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -39,10 +39,6 @@
#ifndef _COMPAT_SYS_SIGTYPES_H_
#define _COMPAT_SYS_SIGTYPES_H_
-#if defined(_KERNEL_OPT)
-#include "opt_compat_netbsd32.h"
-#endif
-
#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
defined(_NETBSD_SOURCE)
@@ -67,7 +63,7 @@ struct sigaltstack13 {
#endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || ... */
-#if
CVS commit: src/sys/compat/sys
Module Name:src Committed By: christos Date: Thu Jun 27 01:58:49 UTC 2019 Modified Files: src/sys/compat/sys: rnd.h siginfo.h sigtypes.h ttycom.h ucontext.h Log Message: Always include the 32 bit structure and definitions on _LP64 regardless of compat32 being on or off, because we want the headers to work when compiling modular kernels. Of course the 32 bit structs do not make sense on platforms that don't have 32 bit modes (alpha), but we don't have a define for that and it does not hurt. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sys/rnd.h \ src/sys/compat/sys/siginfo.h cvs rdiff -u -r1.2 -r1.3 src/sys/compat/sys/sigtypes.h cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/ttycom.h cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/ucontext.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: maya Date: Wed Jun 19 16:14:07 UTC 2019 Modified Files: src/sys/compat/sys: siginfo.h Log Message: Match the regular _ksiginfo size since sys/sys/siginfo.h:1.33 "Expand siginfo_t (struct size not changed) to new values for SIGTRAP TRAP_SCE/TRAP_SCX events." Fixes port-mips/54309: gdb doesn't work on mips64 (32bit userland, 64bit kernel) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/siginfo.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: maya
Date: Wed Jun 19 16:14:07 UTC 2019
Modified Files:
src/sys/compat/sys: siginfo.h
Log Message:
Match the regular _ksiginfo size since sys/sys/siginfo.h:1.33
"Expand siginfo_t (struct size not changed) to new values for
SIGTRAP TRAP_SCE/TRAP_SCX events."
Fixes port-mips/54309: gdb doesn't work on mips64 (32bit userland,
64bit kernel)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/siginfo.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/siginfo.h
diff -u src/sys/compat/sys/siginfo.h:1.4 src/sys/compat/sys/siginfo.h:1.5
--- src/sys/compat/sys/siginfo.h:1.4 Mon Apr 28 20:23:46 2008
+++ src/sys/compat/sys/siginfo.h Wed Jun 19 16:14:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.4 2008/04/28 20:23:46 martin Exp $ */
+/* $NetBSD: siginfo.h,v 1.5 2019/06/19 16:14:07 maya Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -72,6 +72,13 @@ struct __ksiginfo32 {
int32_t _band;
int _fd;
} _poll;
+
+ struct {
+ int _sysnum;
+ int _retval[2];
+ int _error;
+ uint64_t _args[8]; /* SYS_MAXSYSARGS */
+ } _syscall;
} _reason;
};
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Jun 18 16:46:03 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c Log Message: sort -u opt_ to remove dup. To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/sys/compat/netbsd32/netbsd32_netbsd.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: Tue Jun 18 16:46:03 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c Log Message: sort -u opt_ to remove dup. To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/sys/compat/netbsd32/netbsd32_netbsd.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_netbsd.c diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.225 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.226 --- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.225 Tue Jun 18 12:22:54 2019 +++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Jun 18 12:46:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_netbsd.c,v 1.225 2019/06/18 16:22:54 christos Exp $ */ +/* $NetBSD: netbsd32_netbsd.c,v 1.226 2019/06/18 16:46:03 christos Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.225 2019/06/18 16:22:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.226 2019/06/18 16:46:03 christos Exp $"); /* * below are all the standard NetBSD system calls, in the 32bit @@ -46,15 +46,14 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net */ #if defined(_KERNEL_OPT) +#include "opt_compat_43.h" +#include "opt_compat_netbsd.h" #include "opt_ddb.h" -#include "opt_ntp.h" #include "opt_ktrace.h" -#include "opt_compat_netbsd.h" -#include "opt_compat_43.h" -#include "opt_sysv.h" +#include "opt_ntp.h" #include "opt_quota.h" #include "opt_syscall_debug.h" -#include "opt_quota.h" +#include "opt_sysv.h" #endif #include
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Tue Jun 18 16:24:32 UTC 2019
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.141 -r1.142 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.139 -r1.140 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.31 -r1.32 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.141 src/sys/compat/netbsd32/netbsd32_syscall.h:1.142
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.141 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Jun 18 12:24:32 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.141 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.142 2019/06/18 16:24:32 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1240,9 +1240,13 @@
/* syscall: "netbsd32_futimens" ret: "int" args: "int" "const netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32_futimens 472
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32___quotactl" ret: "int" args: "const netbsd32_charp" "netbsd32_voidp" */
#define NETBSD32_SYS_netbsd32___quotactl 473
+#else
+/* 473 is excluded netbsd32___quotactl */
+#endif
/* 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
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.140 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.140 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Jun 18 12:24:32 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.140 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.141 2019/06/18 16:24:32 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2534,12 +2534,15 @@ struct netbsd32_futimens_args {
syscallarg(const netbsd32_timespecp_t) tptr;
};
check_syscall_args(netbsd32_futimens)
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
struct netbsd32___quotactl_args {
syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_voidp) args;
};
check_syscall_args(netbsd32___quotactl)
+#else
+#endif
struct netbsd32_posix_spawn_args {
syscallarg(netbsd32_pid_tp) pid;
@@ -3424,8 +3427,11 @@ int netbsd32_unlinkat(struct lwp *, cons
int netbsd32_futimens(struct lwp *, const struct netbsd32_futimens_args *, register_t *);
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
int netbsd32___quotactl(struct lwp *, const struct netbsd32___quotactl_args *, register_t *);
+#else
+#endif
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 *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.140 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.140 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Jun 18 12:24:32 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD:
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Jun 18 16:24:32 UTC 2019 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.141 -r1.142 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.20 -r1.21 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.139 -r1.140 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.31 -r1.32 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: Tue Jun 18 16:23:24 UTC 2019
Modified Files:
src/sys/compat/netbsd32: syscalls.master
Log Message:
Add ifdef for quota and include the syscall numbers header
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.126 src/sys/compat/netbsd32/syscalls.master:1.127
--- src/sys/compat/netbsd32/syscalls.master:1.126 Mon Jun 17 21:36:50 2019
+++ src/sys/compat/netbsd32/syscalls.master Tue Jun 18 12:23:24 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp $
+ $NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -50,6 +50,7 @@
#include
#include
+#include
#include
%%
@@ -1124,8 +1125,12 @@
int flag); }
472 STD { int|netbsd32||futimens(int fd, \
const netbsd32_timespecp_t tptr); }
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
473 STD { int|netbsd32||__quotactl(const netbsd32_charp path, \
netbsd32_voidp args); }
+#else
+473 EXCL netbsd32___quotactl
+#endif
474 NOERR { int|netbsd32||posix_spawn(netbsd32_pid_tp pid, \
const netbsd32_charp path, \
const netbsd32_posix_spawn_file_actionsp \
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Jun 18 16:23:24 UTC 2019 Modified Files: src/sys/compat/netbsd32: syscalls.master Log Message: Add ifdef for quota and include the syscall numbers header To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 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: Tue Jun 18 16:22:54 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c netbsd32_quota.c Log Message: Add options for quota. To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_quota.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: Tue Jun 18 16:22:54 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c netbsd32_quota.c
Log Message:
Add options for quota.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_quota.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_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.224 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.225
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.224 Tue Jun 18 12:05:30 2019
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Jun 18 12:22:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.224 2019/06/18 16:05:30 pgoyette Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.225 2019/06/18 16:22:54 christos Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.224 2019/06/18 16:05:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.225 2019/06/18 16:22:54 christos Exp $");
/*
* below are all the standard NetBSD system calls, in the 32bit
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
#include "opt_compat_netbsd.h"
#include "opt_compat_43.h"
#include "opt_sysv.h"
+#include "opt_quota.h"
#include "opt_syscall_debug.h"
#include "opt_quota.h"
#endif
Index: src/sys/compat/netbsd32/netbsd32_quota.c
diff -u src/sys/compat/netbsd32/netbsd32_quota.c:1.1 src/sys/compat/netbsd32/netbsd32_quota.c:1.2
--- src/sys/compat/netbsd32/netbsd32_quota.c:1.1 Mon Dec 24 15:44:39 2018
+++ src/sys/compat/netbsd32/netbsd32_quota.c Tue Jun 18 12:22:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_quota.c,v 1.1 2018/12/24 20:44:39 mrg Exp $ */
+/* $NetBSD: netbsd32_quota.c,v 1.2 2019/06/18 16:22:54 christos Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
@@ -29,7 +29,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_quota.c,v 1.1 2018/12/24 20:44:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_quota.c,v 1.2 2019/06/18 16:22:54 christos Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_quota.h"
+#endif
#include
#include
@@ -42,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_quo
#include
#include
+#ifdef QUOTA
int
netbsd32___quotactl(struct lwp *l, const struct netbsd32___quotactl_args *uap, register_t *retval)
{
@@ -135,3 +140,4 @@ netbsd32___quotactl(struct lwp *l, const
return do_sys_quotactl(SCARG_P32(uap, path), );
}
+#endif
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: christos Date: Tue Jun 18 01:42:36 UTC 2019 Modified Files: src/sys/compat/freebsd: syscalls.master Log Message: add quota option To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 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: christos
Date: Tue Jun 18 01:42:36 UTC 2019
Modified Files:
src/sys/compat/freebsd: syscalls.master
Log Message:
add quota option
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 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/syscalls.master
diff -u src/sys/compat/freebsd/syscalls.master:1.72 src/sys/compat/freebsd/syscalls.master:1.73
--- src/sys/compat/freebsd/syscalls.master:1.72 Sat Jan 6 11:41:23 2018
+++ src/sys/compat/freebsd/syscalls.master Mon Jun 17 21:42:36 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -36,6 +36,7 @@
#include "opt_ntp.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include
@@ -277,9 +278,14 @@
146 NOARGS { int|compat_43_sys||killpg(int pgid, int signum); } \
okillpg
147 NOARGS { int|sys||setsid(void); }
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
148 NOARGS { int|compat_50_sys||quotactl(char *path, int cmd, \
int uid, void *arg); }
149 NOARGS { int|compat_43_sys||quota(void); } oquota
+#else
+148 EXCL compat_50_sys_quotactl
+149 EXCL compat_43_sys_quota
+#endif
150 NOARGS { int|compat_43_sys||getsockname(int fdec, void *asa, \
int *alen); } ogetsockname
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: christos Date: Tue Jun 18 01:42:44 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.92 -r1.93 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.90 -r1.91 src/sys/compat/freebsd/freebsd_syscalls.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: christos
Date: Tue Jun 18 01:42:44 UTC 2019
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/freebsd/freebsd_syscalls.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/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.89 src/sys/compat/freebsd/freebsd_syscall.h:1.90
--- src/sys/compat/freebsd/freebsd_syscall.h:1.89 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_syscall.h Mon Jun 17 21:42:44 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.89 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.90 2019/06/18 01:42:44 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -438,12 +438,17 @@
/* syscall: "setsid" ret: "int" args: */
#define FREEBSD_SYS_setsid 147
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "quotactl" ret: "int" args: "char *" "int" "int" "void *" */
#define FREEBSD_SYS_quotactl 148
/* syscall: "oquota" ret: "int" args: */
#define FREEBSD_SYS_oquota 149
+#else
+/* 148 is excluded compat_50_sys_quotactl */
+/* 149 is excluded compat_43_sys_quota */
+#endif
/* syscall: "ogetsockname" ret: "int" args: "int" "void *" "int *" */
#define FREEBSD_SYS_ogetsockname 150
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.92 src/sys/compat/freebsd/freebsd_syscallargs.h:1.93
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.92 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Mon Jun 17 21:42:44 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.92 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.93 2019/06/18 01:42:44 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -300,8 +300,11 @@ struct compat_43_sys_getrlimit_args;
struct compat_43_sys_setrlimit_args;
struct compat_43_sys_killpg_args;
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
struct compat_50_sys_quotactl_args;
+#else
+#endif
struct compat_43_sys_getsockname_args;
@@ -879,10 +882,13 @@ int compat_43_sys_killpg(struct lwp *, c
int sys_setsid(struct lwp *, const void *, register_t *);
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
int compat_50_sys_quotactl(struct lwp *, const struct compat_50_sys_quotactl_args *, register_t *);
int compat_43_sys_quota(struct lwp *, const void *, register_t *);
+#else
+#endif
int compat_43_sys_getsockname(struct lwp *, const struct compat_43_sys_getsockname_args *, register_t *);
int compat_43_sys_getdirentries(struct lwp *, const struct compat_43_sys_getdirentries_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.92 src/sys/compat/freebsd/freebsd_sysent.c:1.93
--- src/sys/compat/freebsd/freebsd_sysent.c:1.92 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_sysent.c Mon Jun 17 21:42:44 2019
@@ -1,20 +1,21 @@
-/* $NetBSD: freebsd_sysent.c,v 1.92 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.93 2019/06/18 01:42:44 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.92 2018/08/10 21:47:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.93 2019/06/18 01:42:44 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include
#include
@@ -691,6 +692,7 @@ struct sysent freebsd_sysent[] = {
{
.sy_call = (sy_call_t *)sys_setsid
}, /* 147 = setsid */
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_sys_quotactl_args),
.sy_flags = SYCALL_ARG_PTR,
@@ -699,6 +701,14 @@ struct sysent
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: christos Date: Tue Jun 18 01:39:01 UTC 2019 Modified Files: src/sys/compat/aoutm68k: syscalls.master Log Message: fix excl To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 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: christos
Date: Tue Jun 18 01:39:01 UTC 2019
Modified Files:
src/sys/compat/aoutm68k: syscalls.master
Log Message:
fix excl
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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/syscalls.master
diff -u src/sys/compat/aoutm68k/syscalls.master:1.43 src/sys/compat/aoutm68k/syscalls.master:1.44
--- src/sys/compat/aoutm68k/syscalls.master:1.43 Mon Jun 17 21:38:07 2019
+++ src/sys/compat/aoutm68k/syscalls.master Mon Jun 17 21:39:01 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.43 2019/06/18 01:38:07 christos Exp $
+ $NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -422,7 +422,7 @@
150 NOARGS { int|compat_43_sys||getsockname(int fdec, void *asa, \
int *alen); } ogetsockname
#else
-149 EXCL compat_43_sys_quota
+150 EXCL compat_43_sys_getsockname
#endif
; Syscalls 151-180 inclusive are reserved for vendor-specific
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: christos Date: Tue Jun 18 01:39:09 UTC 2019 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.52 -r1.53 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.51 -r1.52 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.56 -r1.57 src/sys/compat/aoutm68k/aoutm68k_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/aoutm68k/aoutm68k_syscall.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.54 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.55 --- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.54 Sat Jan 26 21:08:39 2019 +++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Mon Jun 17 21:39:09 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscall.h,v 1.54 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: aoutm68k_syscall.h,v 1.55 2019/06/18 01:39:09 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp */ #ifndef _AOUTM68K_SYS_SYSCALL_H_ @@ -548,18 +548,25 @@ /* syscall: "setsid" ret: "int" args: */ #define AOUTM68K_SYS_setsid 147 +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* syscall: "quotactl" ret: "int" args: "const char *" "int" "int" "void *" */ #define AOUTM68K_SYS_quotactl 148 -#if defined(COMPAT_43) || !defined(_KERNEL) +#else +/* 148 is excluded compat_50_sys_quotactl */ +#endif +#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT) /* syscall: "oquota" ret: "int" args: */ #define AOUTM68K_SYS_oquota 149 +#else +/* 149 is excluded compat_43_sys_quota */ +#endif +#if defined(COMPAT_43) || !defined(_KERNEL_OPT) /* syscall: "ogetsockname" ret: "int" args: "int" "void *" "int *" */ #define AOUTM68K_SYS_ogetsockname 150 #else -/* 149 is excluded compat_43_sys_quota */ /* 150 is excluded compat_43_sys_getsockname */ #endif /* 155 is excluded nfssvc */ Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.52 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.53 --- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.52 Sat Jan 26 21:08:39 2019 +++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Mon Jun 17 21:39:09 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscallargs.h,v 1.52 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: aoutm68k_syscallargs.h,v 1.53 2019/06/18 01:39:09 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp */ #ifndef _AOUTM68K_SYS_SYSCALLARGS_H_ @@ -359,9 +359,15 @@ struct compat_43_sys_setrlimit_args; struct compat_43_sys_killpg_args; #else #endif +#if defined(QUOTA) || !defined(_KERNEL_OPT) struct compat_50_sys_quotactl_args; -#if defined(COMPAT_43) || !defined(_KERNEL) +#else +#endif +#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT) +#else +#endif +#if defined(COMPAT_43) || !defined(_KERNEL_OPT) struct compat_43_sys_getsockname_args; #else @@ -1007,11 +1013,17 @@ int compat_43_sys_killpg(struct lwp *, c #endif int sys_setsid(struct lwp *, const void *, register_t *); +#if defined(QUOTA) || !defined(_KERNEL_OPT) int compat_50_sys_quotactl(struct lwp *, const struct compat_50_sys_quotactl_args *, register_t *); -#if defined(COMPAT_43) || !defined(_KERNEL) +#else +#endif +#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT) int compat_43_sys_quota(struct lwp *, const void *, register_t *); +#else +#endif +#if defined(COMPAT_43) || !defined(_KERNEL_OPT) int compat_43_sys_getsockname(struct lwp *, const struct compat_43_sys_getsockname_args *, register_t *); #else Index: src/sys/compat/aoutm68k/aoutm68k_syscalls.c diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.51 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.52 --- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.51 Sat Jan 26 21:08:39 2019 +++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Mon Jun 17 21:39:09 2019 @@ -1,14 +1,14 @@ -/* $NetBSD: aoutm68k_syscalls.c,v 1.51 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: aoutm68k_syscalls.c,v 1.52 2019/06/18 01:39:09 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01
CVS commit: src/sys/compat/aoutm68k
Module Name:src
Committed By: christos
Date: Tue Jun 18 01:38:07 UTC 2019
Modified Files:
src/sys/compat/aoutm68k: syscalls.master
Log Message:
add quota check
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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/syscalls.master
diff -u src/sys/compat/aoutm68k/syscalls.master:1.42 src/sys/compat/aoutm68k/syscalls.master:1.43
--- src/sys/compat/aoutm68k/syscalls.master:1.42 Sat Jan 26 21:08:39 2019
+++ src/sys/compat/aoutm68k/syscalls.master Mon Jun 17 21:38:07 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.42 2019/01/27 02:08:39 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.43 2019/06/18 01:38:07 christos Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -41,6 +41,7 @@
#include "opt_compat_netbsd.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include
@@ -406,15 +407,22 @@
146 EXCL compat_43_sys_killpg
#endif
147 NOARGS { int|sys||setsid(void); }
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
148 NOARGS { int|compat_50_sys||quotactl(const char *path, \
int cmd, int uid, void *arg); }
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+148 EXCL compat_50_sys_quotactl
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
149 NOARGS { int|compat_43_sys||quota(void); } oquota
+#else
+149 EXCL compat_43_sys_quota
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
150 NOARGS { int|compat_43_sys||getsockname(int fdec, void *asa, \
int *alen); } ogetsockname
#else
149 EXCL compat_43_sys_quota
-150 EXCL compat_43_sys_getsockname
#endif
; Syscalls 151-180 inclusive are reserved for vendor-specific
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: christos Date: Tue Jun 18 01:38:07 UTC 2019 Modified Files: src/sys/compat/aoutm68k: syscalls.master Log Message: add quota check To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 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/netbsd32
Module Name:src
Committed By: christos
Date: Tue Jun 18 01:37:04 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_50.c 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.36 -r1.37 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.139 -r1.140 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.138 -r1.139 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.30 -r1.31 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_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.36 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.37
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.36 Fri Mar 1 06:06:56 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Mon Jun 17 21:37:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.36 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.37 2019/06/18 01:37:03 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,11 +36,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.36 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.37 2019/06/18 01:37:03 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
-#include
+#include "opt_ntp.h"
+#include "opt_quota.h"
#endif
@@ -915,6 +916,7 @@ compat_50_netbsd32_getitimer(struct lwp
return copyout(, SCARG_P32(uap, itv), sizeof(s32it));
}
+#ifdef QUOTA
int
compat_50_netbsd32_quotactl(struct lwp *l, const struct compat_50_netbsd32_quotactl_args *uap, register_t *retval)
{
@@ -932,6 +934,7 @@ compat_50_netbsd32_quotactl(struct lwp *
NETBSD32TOP_UAP(arg, void *);
return (compat_50_sys_quotactl(l, , retval));
}
+#endif
#ifdef NTP
int
@@ -1023,8 +1026,10 @@ static struct syscall_package compat_net
(sy_call_t *)compat_50_netbsd32_setitimer },
{ NETBSD32_SYS_compat_50_netbsd32_getitimer, 0,
(sy_call_t *)compat_50_netbsd32_getitimer },
+#ifdef QUOTA
{ NETBSD32_SYS_compat_50_netbsd32_quotactl, 0,
(sy_call_t *)compat_50_netbsd32_quotactl },
+#endif
#ifdef NTP
{ NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, 0,
(sy_call_t *)compat_50_netbsd32_ntp_gettime },
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.140 src/sys/compat/netbsd32/netbsd32_syscall.h:1.141
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.140 Sat Jan 26 21:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Jun 17 21:37:04 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.140 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.141 2019/06/18 01:37:04 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -428,12 +428,17 @@
/* syscall: "setsid" ret: "int" args: */
#define NETBSD32_SYS_setsid 147
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32_quotactl" ret: "int" args: "netbsd32_charp" "int" "int" "netbsd32_voidp" */
#define NETBSD32_SYS_compat_50_netbsd32_quotactl 148
/* syscall: "compat_43_oquota" ret: "int" args: */
#define NETBSD32_SYS_compat_43_oquota 149
+#else
+/* 148 is excluded compat_netbsd32_quotactl */
+/* 149 is excluded compat_netbsd32_quota */
+#endif
/* syscall: "compat_43_netbsd32_ogetsockname" ret: "int" args: "int" "netbsd32_voidp" "netbsd32_intp" */
#define NETBSD32_SYS_compat_43_netbsd32_ogetsockname 150
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.139 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.140
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.139 Sat Jan 26 21:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Jun 17 21:37:04 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.139 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.140 2019/06/18 01:37:04 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Jun 18 01:37:04 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c 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.36 -r1.37 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.139 -r1.140 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.19 -r1.20 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.138 -r1.139 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.30 -r1.31 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: Tue Jun 18 01:36:50 UTC 2019
Modified Files:
src/sys/compat/netbsd32: files.netbsd32 syscalls.master
Log Message:
use option quota
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r1.125 -r1.126 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/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.44 src/sys/compat/netbsd32/files.netbsd32:1.45
--- src/sys/compat/netbsd32/files.netbsd32:1.44 Sat Jan 26 21:55:02 2019
+++ src/sys/compat/netbsd32/files.netbsd32 Mon Jun 17 21:36:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.44 2019/01/27 02:55:02 christos Exp $
+# $NetBSD: files.netbsd32,v 1.45 2019/06/18 01:36:50 christos Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -25,7 +25,7 @@ file compat/netbsd32/netbsd32_mqueue.c c
file compat/netbsd32/netbsd32_nfssvc.c compat_netbsd32 & nfsserver
file compat/netbsd32/netbsd32_ptrace.c compat_netbsd32 & ptrace
file compat/netbsd32/netbsd32_rlimit.c compat_netbsd32
-file compat/netbsd32/netbsd32_quota.c compat_netbsd32
+file compat/netbsd32/netbsd32_quota.c compat_netbsd32 & quota
file compat/netbsd32/netbsd32_select.c compat_netbsd32
file compat/netbsd32/netbsd32_sem.c compat_netbsd32
file compat/netbsd32/netbsd32_signal.c compat_netbsd32
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.125 src/sys/compat/netbsd32/syscalls.master:1.126
--- src/sys/compat/netbsd32/syscalls.master:1.125 Sat Jan 26 21:08:40 2019
+++ src/sys/compat/netbsd32/syscalls.master Mon Jun 17 21:36:50 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.125 2019/01/27 02:08:40 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -40,6 +40,7 @@
#include "opt_compat_netbsd.h"
#include "opt_ntp.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include
@@ -354,11 +355,16 @@
146 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||killpg(int pgid, int signum); }
147 NOARGS { int|sys||setsid(void); }
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
148 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||quotactl(netbsd32_charp path, int cmd, \
int uid, netbsd32_voidp arg); }
149 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|sys||quota(void); } oquota
+#else
+148 EXCL compat_netbsd32_quotactl
+149 EXCL compat_netbsd32_quota
+#endif
150 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||ogetsockname(int fdec, \
netbsd32_voidp asa, netbsd32_intp alen); }
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Tue Jun 18 01:36:50 UTC 2019 Modified Files: src/sys/compat/netbsd32: files.netbsd32 syscalls.master Log Message: use option quota To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/compat/netbsd32/files.netbsd32 cvs rdiff -u -r1.125 -r1.126 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/common
Module Name:src
Committed By: christos
Date: Mon Jun 17 14:59:15 UTC 2019
Modified Files:
src/sys/compat/common: vfs_syscalls_50.c
Log Message:
Add QUOTA ifdef (Paul Goyette)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/common/vfs_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/vfs_syscalls_50.c
diff -u src/sys/compat/common/vfs_syscalls_50.c:1.21 src/sys/compat/common/vfs_syscalls_50.c:1.22
--- src/sys/compat/common/vfs_syscalls_50.c:1.21 Mon Jun 17 10:13:13 2019
+++ src/sys/compat/common/vfs_syscalls_50.c Mon Jun 17 10:59:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_50.c,v 1.21 2019/06/17 14:13:13 pgoyette Exp $ */
+/* $NetBSD: vfs_syscalls_50.c,v 1.22 2019/06/17 14:59:15 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.21 2019/06/17 14:13:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.22 2019/06/17 14:59:15 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -95,7 +95,9 @@ static const struct syscall_package vfs_
{ SYS_compat_50_futimes, 0, (sy_call_t *)compat_50_sys_futimes },
{ SYS_compat_50_lutimes, 0, (sy_call_t *)compat_50_sys_lutimes },
{ SYS_compat_50_mknod, 0, (sy_call_t *)compat_50_sys_mknod },
+#ifdef QUOTA
{ SYS_compat_50_quotactl, 0, (sy_call_t *)compat_50_sys_quotactl },
+#endif
{ 0, 0, NULL }
};
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Jun 17 14:59:15 UTC 2019 Modified Files: src/sys/compat/common: vfs_syscalls_50.c Log Message: Add QUOTA ifdef (Paul Goyette) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/compat/common/vfs_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/common
Module Name:src Committed By: pgoyette Date: Mon Jun 17 14:13:13 UTC 2019 Modified Files: src/sys/compat/common: vfs_syscalls_50.c Log Message: Use tabs, not spaces, for indentation. NFCI To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/compat/common/vfs_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/common
Module Name:src
Committed By: pgoyette
Date: Mon Jun 17 14:13:13 UTC 2019
Modified Files:
src/sys/compat/common: vfs_syscalls_50.c
Log Message:
Use tabs, not spaces, for indentation. NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/common/vfs_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/vfs_syscalls_50.c
diff -u src/sys/compat/common/vfs_syscalls_50.c:1.20 src/sys/compat/common/vfs_syscalls_50.c:1.21
--- src/sys/compat/common/vfs_syscalls_50.c:1.20 Mon Jun 17 12:27:40 2019
+++ src/sys/compat/common/vfs_syscalls_50.c Mon Jun 17 14:13:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_50.c,v 1.20 2019/06/17 12:27:40 christos Exp $ */
+/* $NetBSD: vfs_syscalls_50.c,v 1.21 2019/06/17 14:13:13 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.20 2019/06/17 12:27:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.21 2019/06/17 14:13:13 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -86,16 +86,16 @@ static void cvtstat(struct stat30 *, con
static const struct syscall_package vfs_syscalls_50_syscalls[] = {
{ SYS_compat_50___stat30, 0, (sy_call_t *)compat_50_sys___stat30 },
-{ SYS_compat_50___fstat30, 0, (sy_call_t *)compat_50_sys___fstat30 },
-{ SYS_compat_50___lstat30, 0, (sy_call_t *)compat_50_sys___lstat30 },
-{ SYS_compat_50___fhstat40, 0, (sy_call_t *)compat_50_sys___fhstat40 },
+ { SYS_compat_50___fstat30, 0, (sy_call_t *)compat_50_sys___fstat30 },
+ { SYS_compat_50___lstat30, 0, (sy_call_t *)compat_50_sys___lstat30 },
+ { SYS_compat_50___fhstat40, 0, (sy_call_t *)compat_50_sys___fhstat40 },
{ SYS_compat_50_utimes, 0, (sy_call_t *)compat_50_sys_utimes },
-{ SYS_compat_50_lfs_segwait, 0,
+ { SYS_compat_50_lfs_segwait, 0,
(sy_call_t *)compat_50_sys_lfs_segwait } ,
-{ SYS_compat_50_futimes, 0, (sy_call_t *)compat_50_sys_futimes },
-{ SYS_compat_50_lutimes, 0, (sy_call_t *)compat_50_sys_lutimes },
+ { SYS_compat_50_futimes, 0, (sy_call_t *)compat_50_sys_futimes },
+ { SYS_compat_50_lutimes, 0, (sy_call_t *)compat_50_sys_lutimes },
{ SYS_compat_50_mknod, 0, (sy_call_t *)compat_50_sys_mknod },
-{ SYS_compat_50_quotactl, 0, (sy_call_t *)compat_50_sys_quotactl },
+ { SYS_compat_50_quotactl, 0, (sy_call_t *)compat_50_sys_quotactl },
{ 0, 0, NULL }
};
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Jun 17 12:27:40 UTC 2019 Modified Files: src/sys/compat/common: vfs_syscalls_50.c Log Message: If we don't compile a kernel with QUOTA, we don't support the compat quota syscalls. XXX: need to fix the modules build. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/common/vfs_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/vfs_syscalls_50.c diff -u src/sys/compat/common/vfs_syscalls_50.c:1.19 src/sys/compat/common/vfs_syscalls_50.c:1.20 --- src/sys/compat/common/vfs_syscalls_50.c:1.19 Sat Jan 26 21:08:39 2019 +++ src/sys/compat/common/vfs_syscalls_50.c Mon Jun 17 08:27:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls_50.c,v 1.19 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: vfs_syscalls_50.c,v 1.20 2019/06/17 12:27:40 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,10 +36,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.19 2019/01/27 02:08:39 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.20 2019/06/17 12:27:40 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" +#include "opt_quota.h" #endif #include @@ -68,9 +69,11 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls #include +#ifdef QUOTA #include #include #include +#endif #include #include @@ -341,6 +344,7 @@ compat_50_sys_mknod(struct lwp *l, SCARG(uap, dev), retval, UIO_USERSPACE); } +#ifdef QUOTA /* ARGSUSED */ int compat_50_sys_quotactl(struct lwp *l, const struct compat_50_sys_quotactl_args *uap, register_t *retval) @@ -450,6 +454,7 @@ compat_50_sys_quotactl(struct lwp *l, co vrele(vp); return error; } +#endif int vfs_syscalls_50_init(void)
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Jun 17 12:27:40 UTC 2019 Modified Files: src/sys/compat/common: vfs_syscalls_50.c Log Message: If we don't compile a kernel with QUOTA, we don't support the compat quota syscalls. XXX: need to fix the modules build. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/common/vfs_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/netbsd32
Module Name:src Committed By: christos Date: Fri Jun 7 20:13:54 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_exec_elf32.c Log Message: Sync auxv vector generation with exec_elf.c. Fixes $ORIGIN on compat_netbsd32. Found by zerous as part of GSoC To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_exec_elf32.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: Fri Jun 7 20:13:54 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_exec_elf32.c
Log Message:
Sync auxv vector generation with exec_elf.c. Fixes $ORIGIN on compat_netbsd32.
Found by zerous as part of GSoC
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_exec_elf32.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_exec_elf32.c
diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.43 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.44
--- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.43 Fri Mar 1 06:06:56 2019
+++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Fri Jun 7 16:13:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec_elf32.c,v 1.43 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_exec_elf32.c,v 1.44 2019/06/07 20:13:54 christos Exp $ */
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
/*
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.43 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.44 2019/06/07 20:13:54 christos Exp $");
#define ELFSIZE 32
@@ -134,8 +134,8 @@ int
netbsd32_elf32_copyargs(struct lwp *l, struct exec_package *pack,
struct ps_strings *arginfo, char **stackp, void *argp)
{
- size_t len;
- AuxInfo ai[ELF_AUX_ENTRIES], *a;
+ size_t len, vlen;
+ AuxInfo ai[ELF_AUX_ENTRIES], *a, *execname;
struct elf_args *ap;
int error;
@@ -200,17 +200,36 @@ netbsd32_elf32_copyargs(struct lwp *l, s
a->a_v = l->l_proc->p_stackbase;
a++;
+ execname = a;
+ a->a_type = AT_SUN_EXECNAME;
+ a++;
+
exec_free_emul_arg(pack);
+ } else {
+ execname = NULL;
}
a->a_type = AT_NULL;
a->a_v = 0;
a++;
- len = (a - ai) * sizeof(AuxInfo);
+ vlen = (a - ai) * sizeof(ai[0]);
+
+ KASSERT(vlen <= sizeof(ai));
+
+ if (execname) {
+ char *path = l->l_proc->p_path;
+ execname->a_v = (uintptr_t)(*stackp + vlen);
+ len = strlen(path) + 1;
+ if ((error = copyout(path, (*stackp + vlen), len)) != 0)
+ return error;
+ len = ALIGN(len);
+ } else {
+ len = 0;
+ }
if ((error = copyout(ai, *stackp, len)) != 0)
return error;
- *stackp += len;
+ *stackp += vlen + len;
return 0;
}
CVS commit: src/sys/compat/common
Module Name:src
Committed By: pgoyette
Date: Mon Apr 29 08:31:29 UTC 2019
Modified Files:
src/sys/compat/common: rtsock_50.c rtsock_70.c
Log Message:
Move the set-up of the net.oroute... sysctl tree to compat_50 since
the new AF_ROUTE was introduced in NetBSD-6.0
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/rtsock_70.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.10 src/sys/compat/common/rtsock_50.c:1.11
--- src/sys/compat/common/rtsock_50.c:1.10 Fri Mar 1 11:06:56 2019
+++ src/sys/compat/common/rtsock_50.c Mon Apr 29 08:31:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.11 2019/04/29 08:31:29 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.11 2019/04/29 08:31:29 pgoyette Exp $");
#define COMPAT_RTSOCK /* Use the COMPATNAME/COMPATCALL macros and the
* various other compat definitions - see
@@ -71,6 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,
#include
#include
+struct sysctllog *clog;
+
void
compat_50_rt_oifmsg(struct ifnet *ifp)
{
@@ -164,12 +166,14 @@ rtsock_50_init(void)
compat_50_rt_ifannouncemsg);
MODULE_HOOK_SET(rtsock_rt_ieee80211msg_50_hook, "rts_50",
compat_50_rt_ieee80211msg);
+ sysctl_net_route_setup(, PF_OROUTE, "ortable");
}
void
rtsock_50_fini(void)
{
+ sysctl_teardown();
MODULE_HOOK_UNSET(rtsock_iflist_50_hook);
MODULE_HOOK_UNSET(rtsock_oifmsg_50_hook);
MODULE_HOOK_UNSET(rtsock_rt_missmsg_50_hook);
Index: src/sys/compat/common/rtsock_70.c
diff -u src/sys/compat/common/rtsock_70.c:1.6 src/sys/compat/common/rtsock_70.c:1.7
--- src/sys/compat/common/rtsock_70.c:1.6 Mon Apr 29 05:42:09 2019
+++ src/sys/compat/common/rtsock_70.c Mon Apr 29 08:31:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_70.c,v 1.6 2019/04/29 05:42:09 pgoyette Exp $ */
+/* $NetBSD: rtsock_70.c,v 1.7 2019/04/29 08:31:29 pgoyette Exp $ */
/*
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.6 2019/04/29 05:42:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.7 2019/04/29 08:31:29 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,
#include
#include
-struct sysctllog *clog;
-
void
compat_70_rt_newaddrmsg1(int cmd, struct ifaddr *ifa)
{
@@ -124,14 +122,12 @@ rtsock_70_init(void)
MODULE_HOOK_SET(rtsock_newaddr_70_hook, "rts_70",
compat_70_rt_newaddrmsg1);
MODULE_HOOK_SET(rtsock_iflist_70_hook, "rts_70", compat_70_iflist_addr);
- sysctl_net_route_setup(, PF_OROUTE, "ortable");
}
void
rtsock_70_fini(void)
{
- sysctl_teardown();
MODULE_HOOK_UNSET(rtsock_newaddr_70_hook);
MODULE_HOOK_UNSET(rtsock_iflist_70_hook);
}
CVS commit: src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Mon Apr 29 08:31:29 UTC 2019 Modified Files: src/sys/compat/common: rtsock_50.c rtsock_70.c Log Message: Move the set-up of the net.oroute... sysctl tree to compat_50 since the new AF_ROUTE was introduced in NetBSD-6.0 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/compat/common/rtsock_50.c cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/rtsock_70.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: msaitoh
Date: Tue Apr 23 07:45:07 UTC 2019
Modified Files:
src/sys/compat/common: uipc_syscalls_40.c
src/sys/compat/netbsd32: netbsd32_ioctl.c
src/sys/compat/sunos: sunos_ioctl.c
src/sys/compat/sunos32: sunos32_ioctl.c
src/sys/compat/ultrix: ultrix_ioctl.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.101 -r1.102 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/sunos/sunos_ioctl.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_ioctl.c
cvs rdiff -u -r1.37 -r1.38 src/sys/compat/ultrix/ultrix_ioctl.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_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.19 src/sys/compat/common/uipc_syscalls_40.c:1.20
--- src/sys/compat/common/uipc_syscalls_40.c:1.19 Thu Apr 18 17:45:12 2019
+++ src/sys/compat/common/uipc_syscalls_40.c Tue Apr 23 07:45:06 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: uipc_syscalls_40.c,v 1.19 2019/04/18 17:45:12 christos Exp $ */
+/* $NetBSD: uipc_syscalls_40.c,v 1.20 2019/04/23 07:45:06 msaitoh Exp $ */
/* written by Pavel Cahyna, 2006. Public domain. */
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.19 2019/04/18 17:45:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.20 2019/04/23 07:45:06 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -29,10 +29,8 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
#include
/*
- * Return interface configuration
- * of system. List may be used
- * in later ioctl's (above) to get
- * other information.
+ * Return interface configuration of system. List may be used in later
+ * ioctl's (above) to get other information.
*/
/*ARGSUSED*/
static int
@@ -158,7 +156,7 @@ compat_ifconf(u_long cmd, void *data)
ifc->ifc_len -= space;
else
ifc->ifc_len = -space;
- return (0);
+ return 0;
release_exit:
if_release(ifp, );
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.101 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.102
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.101 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Tue Apr 23 07:45:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.101 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.102 2019/04/23 07:45:06 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.101 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.102 2019/04/23 07:45:06 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -94,7 +94,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ioc
#if 0
static inline void
-netbsd32_to_format_op(struct netbsd32_format_op *s32p, struct format_op *p, u_long cmd)
+netbsd32_to_format_op(struct netbsd32_format_op *s32p,
+struct format_op *p, u_long cmd)
{
p->df_buf = (char *)NETBSD32PTR64(s32p->df_buf);
@@ -142,8 +143,9 @@ netbsd32_to_oifreq(struct netbsd32_oifre
static inline void
netbsd32_to_if_addrprefreq(const struct netbsd32_if_addrprefreq *ifap32,
- struct if_addrprefreq *ifap, u_long cmd)
+struct if_addrprefreq *ifap, u_long cmd)
{
+
strlcpy(ifap->ifap_name, ifap32->ifap_name, sizeof(ifap->ifap_name));
ifap->ifap_preference = ifap32->ifap_preference;
memcpy(>ifap_addr, >ifap_addr,
@@ -160,7 +162,8 @@ netbsd32_to_ifconf(struct netbsd32_ifcon
}
static inline void
-netbsd32_to_ifmediareq(struct netbsd32_ifmediareq *s32p, struct ifmediareq *p, u_long cmd)
+netbsd32_to_ifmediareq(struct netbsd32_ifmediareq *s32p,
+struct ifmediareq *p, u_long cmd)
{
memcpy(p, s32p, sizeof *s32p);
@@ -211,7 +214,8 @@ netbsd32_to_ifdrv(struct netbsd32_ifdrv
}
static inline void
-netbsd32_to_sioc_vif_req(struct netbsd32_sioc_vif_req *s32p, struct sioc_vif_req *p, u_long cmd)
+netbsd32_to_sioc_vif_req(struct netbsd32_sioc_vif_req *s32p,
+struct sioc_vif_req *p, u_long cmd)
{
p->vifi = s32p->vifi;
@@ -222,7 +226,8 @@ netbsd32_to_sioc_vif_req(struct netbsd32
}
static inline void
-netbsd32_to_sioc_sg_req(struct netbsd32_sioc_sg_req *s32p, struct sioc_sg_req *p, u_long cmd)
+netbsd32_to_sioc_sg_req(struct netbsd32_sioc_sg_req *s32p,
+struct sioc_sg_req *p, u_long cmd)
{
p->src = s32p->src;
@@ -235,6 +240,7 @@ netbsd32_to_sioc_sg_req(struct netbsd32_
static inline void
netbsd32_to_atareq(struct netbsd32_atareq *s32p, struct atareq *p, u_long cmd)
{
+
p->flags = (u_long)s32p->flags;
p->command = s32p->command;
p->features = s32p->features;
@@ -250,7 +256,8 @@ netbsd32_to_atareq(struct netbsd32_atare
}
static inline void
CVS commit: src/sys/compat
Module Name:src Committed By: msaitoh Date: Tue Apr 23 07:45:07 UTC 2019 Modified Files: src/sys/compat/common: uipc_syscalls_40.c src/sys/compat/netbsd32: netbsd32_ioctl.c src/sys/compat/sunos: sunos_ioctl.c src/sys/compat/sunos32: sunos32_ioctl.c src/sys/compat/ultrix: ultrix_ioctl.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/common/uipc_syscalls_40.c cvs rdiff -u -r1.101 -r1.102 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.68 -r1.69 src/sys/compat/sunos/sunos_ioctl.c cvs rdiff -u -r1.34 -r1.35 src/sys/compat/sunos32/sunos32_ioctl.c cvs rdiff -u -r1.37 -r1.38 src/sys/compat/ultrix/ultrix_ioctl.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: Thu Apr 18 17:45:12 UTC 2019 Modified Files: src/sys/compat/common: uipc_syscalls_40.c src/sys/compat/linux/common: linux_socket.c src/sys/compat/linux32/common: linux32_socket.c Log Message: Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack disclosure. From Andy Nguyen, many thanks! This is the compat code part pointed out by ozaki-r@ To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/compat/common/uipc_syscalls_40.c cvs rdiff -u -r1.144 -r1.145 src/sys/compat/linux/common/linux_socket.c cvs rdiff -u -r1.29 -r1.30 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: Thu Apr 18 17:45:12 UTC 2019
Modified Files:
src/sys/compat/common: uipc_syscalls_40.c
src/sys/compat/linux/common: linux_socket.c
src/sys/compat/linux32/common: linux32_socket.c
Log Message:
Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.144 -r1.145 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.29 -r1.30 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/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.18 src/sys/compat/common/uipc_syscalls_40.c:1.19
--- src/sys/compat/common/uipc_syscalls_40.c:1.18 Fri Mar 1 06:06:56 2019
+++ src/sys/compat/common/uipc_syscalls_40.c Thu Apr 18 13:45:12 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: uipc_syscalls_40.c,v 1.18 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_40.c,v 1.19 2019/04/18 17:45:12 christos Exp $ */
/* written by Pavel Cahyna, 2006. Public domain. */
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.18 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.19 2019/04/18 17:45:12 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -56,6 +56,7 @@ compat_ifconf(u_long cmd, void *data)
return ENOSYS;
}
+ memset(, 0, sizeof(ifr));
if (docopy) {
space = ifc->ifc_len;
ifrp = ifc->ifc_req;
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.144 src/sys/compat/linux/common/linux_socket.c:1.145
--- src/sys/compat/linux/common/linux_socket.c:1.144 Sun Feb 3 23:37:50 2019
+++ src/sys/compat/linux/common/linux_socket.c Thu Apr 18 13:45:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.144 2019/02/04 04:37:50 mrg Exp $ */
+/* $NetBSD: linux_socket.c,v 1.145 2019/04/18 17:45:12 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.144 2019/02/04 04:37:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.145 2019/04/18 17:45:12 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1136,6 +1136,7 @@ linux_getifconf(struct lwp *l, register_
if (error)
return error;
+ memset(, 0, sizeof(ifr));
docopy = ifc.ifc_req != NULL;
if (docopy) {
space = ifc.ifc_len;
Index: src/sys/compat/linux32/common/linux32_socket.c
diff -u src/sys/compat/linux32/common/linux32_socket.c:1.29 src/sys/compat/linux32/common/linux32_socket.c:1.30
--- src/sys/compat/linux32/common/linux32_socket.c:1.29 Wed May 9 21:32:24 2018
+++ src/sys/compat/linux32/common/linux32_socket.c Thu Apr 18 13:45:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_socket.c,v 1.29 2018/05/10 01:32:24 ozaki-r Exp $ */
+/* $NetBSD: linux32_socket.c,v 1.30 2019/04/18 17:45:12 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.29 2018/05/10 01:32:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.30 2019/04/18 17:45:12 christos Exp $");
#include
#include
@@ -431,6 +431,7 @@ linux32_getifconf(struct lwp *l, registe
if (error)
return error;
+ memset(, 0, sizeof(ifr));
docopy = NETBSD32PTR64(ifc.ifc_req) != NULL;
if (docopy) {
space = ifc.ifc_len;
CVS commit: src/sys/compat/common
Module Name:src
Committed By: msaitoh
Date: Wed Apr 17 09:21:57 UTC 2019
Modified Files:
src/sys/compat/common: compat_70_mod.c compat_80_mod.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/compat_70_mod.c \
src/sys/compat/common/compat_80_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_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.2 src/sys/compat/common/compat_70_mod.c:1.3
--- src/sys/compat/common/compat_70_mod.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/compat_70_mod.c Wed Apr 17 09:21:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_70_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: compat_70_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $");
#include
#include
@@ -54,7 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_70_mo
#include
#include
-int compat_70_init(void)
+int
+compat_70_init(void)
{
compat70_ocreds_valid = true;
@@ -64,7 +65,8 @@ int compat_70_init(void)
return 0;
}
-int compat_70_fini(void)
+int
+compat_70_fini(void)
{
uipc_usrreq_70_fini();
Index: src/sys/compat/common/compat_80_mod.c
diff -u src/sys/compat/common/compat_80_mod.c:1.2 src/sys/compat/common/compat_80_mod.c:1.3
--- src/sys/compat/common/compat_80_mod.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/compat_80_mod.c Wed Apr 17 09:21:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_80_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: compat_80_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $");
#include
#include
@@ -46,7 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_80_mo
#include
#include
-int compat_80_init(void)
+int
+compat_80_init(void)
{
kern_mod_80_init();
@@ -54,7 +55,8 @@ int compat_80_init(void)
return 0;
}
-int compat_80_fini(void)
+int
+compat_80_fini(void)
{
kern_mod_80_fini();
CVS commit: src/sys/compat/common
Module Name:src Committed By: msaitoh Date: Wed Apr 17 09:21:57 UTC 2019 Modified Files: src/sys/compat/common: compat_70_mod.c compat_80_mod.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/compat_70_mod.c \ src/sys/compat/common/compat_80_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: Sun Apr 14 11:35:54 UTC 2019 Modified Files: src/sys/compat/common: vnd_50.c Log Message: Only need to #include sys/vnode.h once To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/vnd_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/vnd_50.c diff -u src/sys/compat/common/vnd_50.c:1.3 src/sys/compat/common/vnd_50.c:1.4 --- src/sys/compat/common/vnd_50.c:1.3 Fri Mar 1 11:06:56 2019 +++ src/sys/compat/common/vnd_50.c Sun Apr 14 11:35:54 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vnd_50.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $ */ +/* $NetBSD: vnd_50.c,v 1.4 2019/04/14 11:35:54 pgoyette Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vnd_50.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd_50.c,v 1.4 2019/04/14 11:35:54 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -87,7 +87,6 @@ __KERNEL_RCSID(0, "$NetBSD: vnd_50.c,v 1 #include #include #include -#include #include #include
CVS commit: src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Apr 14 11:35:54 UTC 2019 Modified Files: src/sys/compat/common: vnd_50.c Log Message: Only need to #include sys/vnode.h once To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/vnd_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: msaitoh
Date: Thu Apr 11 04:43:40 UTC 2019
Modified Files:
src/sys/compat/sys: sockio.h
Log Message:
Restore sys/ioccom.h.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 src/sys/compat/sys/sockio.h:1.17
--- src/sys/compat/sys/sockio.h:1.16 Thu Apr 11 04:42:08 2019
+++ src/sys/compat/sys/sockio.h Thu Apr 11 04:43:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.16 2019/04/11 04:42:08 msaitoh Exp $ */
+/* $NetBSD: sockio.h,v 1.17 2019/04/11 04:43:40 msaitoh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -32,6 +32,8 @@
#ifndef _COMPAT_SYS_SOCKIO_H_
#define _COMPAT_SYS_SOCKIO_H_
+#include
+
#define OIFNAMSIZ 16
struct oifreq {
CVS commit: src/sys/compat/sys
Module Name:src Committed By: msaitoh Date: Thu Apr 11 04:43:40 UTC 2019 Modified Files: src/sys/compat/sys: sockio.h Log Message: Restore sys/ioccom.h. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 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/sys
Module Name:src
Committed By: msaitoh
Date: Thu Apr 11 04:42:08 UTC 2019
Modified Files:
src/sys/compat/sys: socket.h sockio.h
Log Message:
Remove unused macro definitions. OK'd by pgoyette.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/sys/socket.h
cvs rdiff -u -r1.15 -r1.16 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/socket.h
diff -u src/sys/compat/sys/socket.h:1.17 src/sys/compat/sys/socket.h:1.18
--- src/sys/compat/sys/socket.h:1.17 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/sys/socket.h Thu Apr 11 04:42:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.17 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: socket.h,v 1.18 2019/04/11 04:42:08 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -46,10 +46,6 @@
#define COMPAT_OSOCK
#endif
-#ifdef COMPAT_70
-#define COMPAT_SOCKCRED70
-#endif
-
#else
#define COMPAT_OSOCK
#endif
Index: src/sys/compat/sys/sockio.h
diff -u src/sys/compat/sys/sockio.h:1.15 src/sys/compat/sys/sockio.h:1.16
--- src/sys/compat/sys/sockio.h:1.15 Wed Apr 10 04:37:00 2019
+++ src/sys/compat/sys/sockio.h Thu Apr 11 04:42:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.15 2019/04/10 04:37:00 msaitoh Exp $ */
+/* $NetBSD: sockio.h,v 1.16 2019/04/11 04:42:08 msaitoh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -32,30 +32,6 @@
#ifndef _COMPAT_SYS_SOCKIO_H_
#define _COMPAT_SYS_SOCKIO_H_
-#ifdef _KERNEL_OPT
-
-#include "opt_compat_netbsd.h"
-#include "opt_modular.h"
-
-#include
-
-#if defined(COMPAT_09) || defined(COMPAT_10) || defined(COMPAT_11) || \
-defined(COMPAT_12) || defined(COMPAT_13) || defined(COMPAT_14) || \
-defined(COMPAT_15) || defined(COMPAT_16) || defined(COMPAT_20) || \
-defined(COMPAT_30) || defined(COMPAT_40) || defined(MODULAR)
-#define COMPAT_OIFREQ
-#endif
-
-#if defined(COMPAT_09) || defined(COMPAT_10) || defined(COMPAT_11) || \
-defined(COMPAT_12) || defined(COMPAT_13) || defined(COMPAT_14) || \
-defined(COMPAT_15) || defined(COMPAT_16) || defined(COMPAT_20) || \
-defined(COMPAT_30) || defined(COMPAT_40) || defined(COMPAT_50) || \
-defined(MODULAR)
-#define COMPAT_OIFDATA
-#endif
-
-#endif /* _KERNEL_OPT */
-
#define OIFNAMSIZ 16
struct oifreq {
CVS commit: src/sys/compat/sys
Module Name:src Committed By: msaitoh Date: Thu Apr 11 04:42:08 UTC 2019 Modified Files: src/sys/compat/sys: socket.h sockio.h Log Message: Remove unused macro definitions. OK'd by pgoyette. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/compat/sys/socket.h cvs rdiff -u -r1.15 -r1.16 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/sys
Module Name:src
Committed By: msaitoh
Date: Wed Apr 10 04:37:00 UTC 2019
Modified Files:
src/sys/compat/sys: sockio.h
Log Message:
Whitespace change. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/sys/compat/sys/sockio.h:1.15
--- src/sys/compat/sys/sockio.h:1.14 Wed Apr 10 04:28:03 2019
+++ src/sys/compat/sys/sockio.h Wed Apr 10 04:37:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.14 2019/04/10 04:28:03 msaitoh Exp $ */
+/* $NetBSD: sockio.h,v 1.15 2019/04/10 04:37:00 msaitoh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -141,43 +141,41 @@ struct oifdatareq {
zero ctrs*/
-
-
#define OBIOCGETIF _IOR('B', 107, struct oifreq)
#define OBIOCSETIF _IOW('B', 108, struct oifreq)
#define OTAPGIFNAME _IOR('e', 0, struct oifreq)
-#define ifreqn2o(oi, ni) \
- do { \
- (void)memcpy((oi)->ifr_name, (ni)->ifr_name, \
- sizeof((oi)->ifr_name)); \
- (void)memcpy(&(oi)->ifr_ifru, &(ni)->ifr_ifru, \
- sizeof((oi)->ifr_ifru)); \
+#define ifreqn2o(oi, ni) \
+ do { \
+ (void)memcpy((oi)->ifr_name, (ni)->ifr_name, \
+ sizeof((oi)->ifr_name)); \
+ (void)memcpy(&(oi)->ifr_ifru, &(ni)->ifr_ifru, \
+ sizeof((oi)->ifr_ifru)); \
} while (/*CONSTCOND*/0)
-#define ifreqo2n(oi, ni) \
- do { \
- (void)memcpy((ni)->ifr_name, (oi)->ifr_name, \
- sizeof((oi)->ifr_name)); \
- (void)memcpy(&(ni)->ifr_ifru, &(oi)->ifr_ifru, \
- sizeof((oi)->ifr_ifru)); \
+#define ifreqo2n(oi, ni) \
+ do { \
+ (void)memcpy((ni)->ifr_name, (oi)->ifr_name, \
+ sizeof((oi)->ifr_name)); \
+ (void)memcpy(&(ni)->ifr_ifru, &(oi)->ifr_ifru, \
+ sizeof((oi)->ifr_ifru)); \
} while (/*CONSTCOND*/0)
-#define ifdatan2o(oi, ni) \
- do { \
- (void)memcpy((oi), (ni), sizeof(*(oi))); \
- (oi)->ifi_lastchange.tv_sec = \
- (int32_t)(ni)->ifi_lastchange.tv_sec; \
- (oi)->ifi_lastchange.tv_usec = \
- (ni)->ifi_lastchange.tv_nsec / 1000; \
+#define ifdatan2o(oi, ni) \
+ do { \
+ (void)memcpy((oi), (ni), sizeof(*(oi))); \
+ (oi)->ifi_lastchange.tv_sec = \
+ (int32_t)(ni)->ifi_lastchange.tv_sec; \
+ (oi)->ifi_lastchange.tv_usec = \
+ (ni)->ifi_lastchange.tv_nsec / 1000; \
} while (/*CONSTCOND*/0)
-#define ifdatao2n(oi, ni) \
- do { \
- (void)memcpy((ni), (oi), sizeof(*(oi))); \
+#define ifdatao2n(oi, ni) \
+ do { \
+ (void)memcpy((ni), (oi), sizeof(*(oi))); \
(ni)->ifi_lastchange.tv_sec = (oi)->ifi_lastchange.tv_sec; \
- (ni)->ifi_lastchange.tv_nsec = \
- (oi)->ifi_lastchange.tv_usec * 1000; \
+ (ni)->ifi_lastchange.tv_nsec = \
+ (oi)->ifi_lastchange.tv_usec * 1000; \
} while (/*CONSTCOND*/0)
#endif /* _COMPAT_SYS_SOCKIO_H_ */
CVS commit: src/sys/compat/sys
Module Name:src Committed By: msaitoh Date: Wed Apr 10 04:37:00 UTC 2019 Modified Files: src/sys/compat/sys: sockio.h Log Message: Whitespace change. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 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/sys
Module Name:src
Committed By: msaitoh
Date: Wed Apr 10 04:28:03 UTC 2019
Modified Files:
src/sys/compat/sys: sockio.h
Log Message:
Fix ifdata"o2n"() macro. This is not a real bug because this macro is not used
from anywhere. Both of SIOCGIFDATA and SIOCZIFDATA use "n2o" because
ZIFDATA is almost the same as GIFDATA except zeroing after read.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/compat/sys/sockio.h:1.14
--- src/sys/compat/sys/sockio.h:1.13 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/sys/sockio.h Wed Apr 10 04:28:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.13 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: sockio.h,v 1.14 2019/04/10 04:28:03 msaitoh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -175,7 +175,6 @@ struct oifdatareq {
#define ifdatao2n(oi, ni) \
do { \
(void)memcpy((ni), (oi), sizeof(*(oi))); \
- sizeof((oi)->ifr_name)); \
(ni)->ifi_lastchange.tv_sec = (oi)->ifi_lastchange.tv_sec; \
(ni)->ifi_lastchange.tv_nsec = \
(oi)->ifi_lastchange.tv_usec * 1000; \
CVS commit: src/sys/compat/sys
Module Name:src Committed By: msaitoh Date: Wed Apr 10 04:28:03 UTC 2019 Modified Files: src/sys/compat/sys: sockio.h Log Message: Fix ifdata"o2n"() macro. This is not a real bug because this macro is not used from anywhere. Both of SIOCGIFDATA and SIOCZIFDATA use "n2o" because ZIFDATA is almost the same as GIFDATA except zeroing after read. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 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.
Re: CVS commit: src/sys/compat/freebsd
Date:Sat, 6 Apr 2019 10:48:32 -0700 From:Jason Thorpe Message-ID: | The only situation I know of where it's wacky is sparc64-built-as-ILP32 | and mips64-built-as-ILP32, where register_t is 64-bit and long is 32-bit. But that is kind of the point - from qhat I can see from a (very) quick scan, register_t is used almost exclusively for syscall args/results (for which it makes sense) - and those are objects which are likely being copied to/from user space. Just like ufetch_ptr() exists, even though a pointer is almost always the same as an int or a long in terms of number of bits, etc, register_t will essentially always be one or the other - but we never really know which. Unlike most of the other contrived types (size_t, intmax_t, ptrdiff_t) which aren't all that frequently shunted around, register_t is, which is why (just like ptr_t) I believe it would be one which should have its own access functions. But I will leave it for you to decide what is really needed there. kre
Re: CVS commit: src/sys/compat/freebsd
> On Apr 6, 2019, at 10:45 AM, Robert Elz wrote: > > Actually, fetching & storing registers (register_t) is a common enough > thing that it might be worth having ufetch_reg (and ustore_reg), probably > as MD #defines that map into one of the other calls. The only situation I know of where it's wacky is sparc64-built-as-ILP32 and mips64-built-as-ILP32, where register_t is 64-bit and long is 32-bit. -- thorpej
Re: CVS commit: src/sys/compat/freebsd
Actually, fetching & storing registers (register_t) is a common enough thing that it might be worth having ufetch_reg (and ustore_reg), probably as MD #defines that map into one of the other calls. kre
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kre Date: Sat Apr 6 17:42:28 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.c Log Message: Revert previous (1.5) and return to the one before that (1.4), and just allow things to be broken if this is used on a system where register_t is int (32 bits) and long is 64 bits.Badly broken... To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/freebsd/freebsd_syscall.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/freebsd/freebsd_syscall.c diff -u src/sys/compat/freebsd/freebsd_syscall.c:1.5 src/sys/compat/freebsd/freebsd_syscall.c:1.6 --- src/sys/compat/freebsd/freebsd_syscall.c:1.5 Sat Apr 6 17:27:58 2019 +++ src/sys/compat/freebsd/freebsd_syscall.c Sat Apr 6 17:42:28 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $ */ +/* $NetBSD: freebsd_syscall.c,v 1.6 2019/04/06 17:42:28 kre Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.6 2019/04/06 17:42:28 kre Exp $"); #include #include @@ -88,7 +88,7 @@ freebsd_syscall(struct trapframe *frame) /* * Code is first argument, followed by actual args. */ - error = ufetch_int((void *)params, ); + error = ufetch_long((void *)params, (u_long *)); if (error) goto bad; params += sizeof(int); @@ -98,9 +98,9 @@ freebsd_syscall(struct trapframe *frame) * Like syscall, but code is a quad, so as to maintain * quad alignment for the rest of the arguments. */ - error = ufetch_int((void *)(params + + error = ufetch_long((void *)(params + _QUAD_LOWWORD * sizeof(int)), -); +(u_long *)); if (error) goto bad; params += sizeof(quad_t);
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kre Date: Sat Apr 6 17:42:28 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.c Log Message: Revert previous (1.5) and return to the one before that (1.4), and just allow things to be broken if this is used on a system where register_t is int (32 bits) and long is 64 bits.Badly broken... To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/freebsd/freebsd_syscall.c 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/freebsd
Date:Sat, 6 Apr 2019 10:30:39 -0700 From:Jason Thorpe Message-ID: <047ba730-614e-46fd-85e2-f501d18f4...@me.com> | This is wrong -- register_t is 64-bit on amd64 ... so u_long | is the better choice of cast. It was wrong anyway, it needs to be an unsigned type (even though code is signed) ... but yes, I will switch it back to the previous version, and we can just hope that this stuff never gets used on a system where long is 64 bits and register_t is 32. kre
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kre Date: Sat Apr 6 17:27:59 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.c Log Message: Revert previous. Instead change ufetch_long() to ufetch_int() in both calls (and also remove the cast on the earlier). These replaced fuword, to fetch a register_t (ie: int). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/freebsd/freebsd_syscall.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/freebsd/freebsd_syscall.c diff -u src/sys/compat/freebsd/freebsd_syscall.c:1.4 src/sys/compat/freebsd/freebsd_syscall.c:1.5 --- src/sys/compat/freebsd/freebsd_syscall.c:1.4 Sat Apr 6 16:22:09 2019 +++ src/sys/compat/freebsd/freebsd_syscall.c Sat Apr 6 17:27:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_syscall.c,v 1.4 2019/04/06 16:22:09 kre Exp $ */ +/* $NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.4 2019/04/06 16:22:09 kre Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $"); #include #include @@ -88,7 +88,7 @@ freebsd_syscall(struct trapframe *frame) /* * Code is first argument, followed by actual args. */ - error = ufetch_long((void *)params, (u_long *)); + error = ufetch_int((void *)params, ); if (error) goto bad; params += sizeof(int); @@ -98,9 +98,9 @@ freebsd_syscall(struct trapframe *frame) * Like syscall, but code is a quad, so as to maintain * quad alignment for the rest of the arguments. */ - error = ufetch_long((void *)(params + + error = ufetch_int((void *)(params + _QUAD_LOWWORD * sizeof(int)), -(u_long *)); +); if (error) goto bad; params += sizeof(quad_t);
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kre Date: Sat Apr 6 17:27:59 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.c Log Message: Revert previous. Instead change ufetch_long() to ufetch_int() in both calls (and also remove the cast on the earlier). These replaced fuword, to fetch a register_t (ie: int). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/freebsd/freebsd_syscall.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: kre Date: Sat Apr 6 16:22:09 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.c Log Message: If using a cast for to make it a u_long * is acceptable a few lines earlier, it should work here too. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/freebsd/freebsd_syscall.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/freebsd/freebsd_syscall.c diff -u src/sys/compat/freebsd/freebsd_syscall.c:1.3 src/sys/compat/freebsd/freebsd_syscall.c:1.4 --- src/sys/compat/freebsd/freebsd_syscall.c:1.3 Sat Apr 6 03:06:28 2019 +++ src/sys/compat/freebsd/freebsd_syscall.c Sat Apr 6 16:22:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_syscall.c,v 1.3 2019/04/06 03:06:28 thorpej Exp $ */ +/* $NetBSD: freebsd_syscall.c,v 1.4 2019/04/06 16:22:09 kre Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.3 2019/04/06 03:06:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.4 2019/04/06 16:22:09 kre Exp $"); #include #include @@ -100,7 +100,7 @@ freebsd_syscall(struct trapframe *frame) */ error = ufetch_long((void *)(params + _QUAD_LOWWORD * sizeof(int)), -); +(u_long *)); if (error) goto bad; params += sizeof(quad_t);
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kre Date: Sat Apr 6 16:22:09 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_syscall.c Log Message: If using a cast for to make it a u_long * is acceptable a few lines earlier, it should work here too. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/freebsd/freebsd_syscall.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/alpha
Module Name:src
Committed By: christos
Date: Tue Mar 26 02:05:28 UTC 2019
Modified Files:
src/sys/compat/linux/arch/alpha: linux_osf1.c
Log Message:
make this compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/linux/arch/alpha/linux_osf1.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/alpha/linux_osf1.c
diff -u src/sys/compat/linux/arch/alpha/linux_osf1.c:1.1 src/sys/compat/linux/arch/alpha/linux_osf1.c:1.2
--- src/sys/compat/linux/arch/alpha/linux_osf1.c:1.1 Sun Mar 24 12:24:19 2019
+++ src/sys/compat/linux/arch/alpha/linux_osf1.c Mon Mar 25 22:05:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_osf1.c,v 1.1 2019/03/24 16:24:19 maxv Exp $ */
+/* $NetBSD: linux_osf1.c,v 1.2 2019/03/26 02:05:28 christos Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_osf1.c,v 1.1 2019/03/24 16:24:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_osf1.c,v 1.2 2019/03/26 02:05:28 christos Exp $");
#include
#include
@@ -419,7 +419,7 @@ linux_sys_osf1_gettimeofday(struct lwp *
memset(, 0, sizeof otv);
otv.tv_sec = tv.tv_sec;
otv.tv_usec = tv.tv_usec;
- error = copyout(, SCARG(uap, tp), sizeof otv);
+ error = copyout(, SCARG(uap, tv), sizeof otv);
if (error == 0 && SCARG(uap, tzp) != NULL) {
memset(, 0, sizeof otz);
CVS commit: src/sys/compat/linux/arch/alpha
Module Name:src Committed By: christos Date: Tue Mar 26 02:05:28 UTC 2019 Modified Files: src/sys/compat/linux/arch/alpha: linux_osf1.c Log Message: make this compile again. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/linux/arch/alpha/linux_osf1.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/alpha
Module Name:src Committed By: maxv Date: Sun Mar 24 16:39:47 UTC 2019 Modified Files: src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.106 -r1.107 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.108 -r1.109 src/sys/compat/linux/arch/alpha/linux_syscalls.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/alpha/linux_syscall.h diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.107 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.108 --- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.107 Fri Aug 10 21:47:14 2018 +++ src/sys/compat/linux/arch/alpha/linux_syscall.h Sun Mar 24 16:39:46 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.107 2018/08/10 21:47:14 pgoyette Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.108 2019/03/24 16:39:46 maxv Exp $ */ /* * System call numbers. @@ -30,6 +30,9 @@ /* syscall: "close" ret: "int" args: "int" */ #define LINUX_SYS_close 6 +/* syscall: "osf1_wait4" ret: "int" args: "int" "int *" "int" "struct osf1_rusage *" */ +#define LINUX_SYS_osf1_wait4 7 + /* syscall: "creat" ret: "int" args: "const char *" "linux_umode_t" */ #define LINUX_SYS_creat 8 @@ -63,6 +66,9 @@ /* syscall: "getpid_with_ppid" ret: "pid_t" args: */ #define LINUX_SYS_getpid_with_ppid 20 +/* syscall: "osf1_mount" ret: "int" args: "int" "const char *" "int" "void *" */ +#define LINUX_SYS_osf1_mount 21 + /* syscall: "setuid" ret: "int" args: "uid_t" */ #define LINUX_SYS_setuid 23 @@ -90,6 +96,9 @@ /* syscall: "pipe" ret: "int" args: */ #define LINUX_SYS_pipe 42 +/* syscall: "osf1_set_program_attributes" ret: "int" args: "void *" "unsigned long" "void *" "unsigned long" */ +#define LINUX_SYS_osf1_set_program_attributes 43 + /* syscall: "open" ret: "int" args: "const char *" "int" "linux_umode_t" */ #define LINUX_SYS_open 45 @@ -156,6 +165,9 @@ /* syscall: "setgroups" ret: "int" args: "int" "const gid_t *" */ #define LINUX_SYS_setgroups 80 +/* syscall: "osf1_setitimer" ret: "int" args: "int" "struct osf1_itimerval *" "struct osf1_itimerval *" */ +#define LINUX_SYS_osf1_setitimer 83 + /* syscall: "gethostname" ret: "int" args: "char *" "u_int" */ #define LINUX_SYS_gethostname 87 @@ -171,6 +183,9 @@ /* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ #define LINUX_SYS_fcntl 92 +/* syscall: "osf1_select" ret: "int" args: "u_int" "fd_set *" "fd_set *" "fd_set *" "struct osf1_timeval *" */ +#define LINUX_SYS_osf1_select 93 + /* syscall: "poll" ret: "int" args: "struct pollfd *" "u_int" "int" */ #define LINUX_SYS_poll 94 @@ -222,6 +237,12 @@ /* syscall: "sendmsg" ret: "ssize_t" args: "int" "const struct linux_msghdr *" "int" */ #define LINUX_SYS_sendmsg 114 +/* syscall: "osf1_gettimeofday" ret: "int" args: "struct osf1_timeval *" "struct osf1_timezone *" */ +#define LINUX_SYS_osf1_gettimeofday 116 + +/* syscall: "osf1_getrusage" ret: "int" args: "int" "struct osf1_rusage *" */ +#define LINUX_SYS_osf1_getrusage 117 + /* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "int *" */ #define LINUX_SYS_getsockopt 118 @@ -231,6 +252,9 @@ /* syscall: "writev" ret: "ssize_t" args: "int" "const struct iovec *" "int" */ #define LINUX_SYS_writev 121 +/* syscall: "osf1_settimeofday" ret: "int" args: "struct osf1_timeval *" "struct osf1_timezone *" */ +#define LINUX_SYS_osf1_settimeofday 122 + /* syscall: "__posix_fchown" ret: "int" args: "int" "uid_t" "gid_t" */ #define LINUX_SYS___posix_fchown 123 @@ -276,6 +300,9 @@ /* syscall: "rmdir" ret: "int" args: "const char *" */ #define LINUX_SYS_rmdir 137 +/* syscall: "osf1_utimes" ret: "int" args: "const char *" "const struct osf1_timeval *" */ +#define LINUX_SYS_osf1_utimes 138 + /* syscall: "getpeername" ret: "int" args: "int" "void *" "int *" */ #define LINUX_SYS_getpeername 141 @@ -297,6 +324,12 @@ /* syscall: "getdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */ #define LINUX_SYS_getdirentries 159 +/* syscall: "osf1_statfs" ret: "int" args: "const char *" "struct osf1_statfs *" "int" */ +#define LINUX_SYS_osf1_statfs 160 + +/* syscall: "osf1_fstatfs" ret: "int" args: "int" "struct osf1_statfs *" "int" */ +#define LINUX_SYS_osf1_fstatfs 161 + /* syscall: "getdomainname" ret: "int" args: "char *" "int" */ #define LINUX_SYS_getdomainname 165 @@ -363,6 +396,18 @@ /* syscall: "getsid" ret: "pid_t" args: "pid_t" */ #define LINUX_SYS_getsid 234 +/* syscall: "osf1_sysinfo" ret: "int" args: "int" "char *" "long" */ +#define LINUX_SYS_osf1_sysinfo 241 + +/* syscall: "osf1_usleep_thread" ret: "int" args: "struct osf1_timeval *" "struct
CVS commit: src/sys/compat/linux/arch/alpha
Module Name:src Committed By: maxv Date: Sun Mar 24 16:39:47 UTC 2019 Modified Files: src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.106 -r1.107 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.108 -r1.109 src/sys/compat/linux/arch/alpha/linux_syscalls.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: maxv
Date: Sun Mar 24 16:24:20 UTC 2019
Modified Files:
src/sys/compat/linux/arch/alpha: files.linux_alpha syscalls.master
src/sys/compat/osf1: files.osf1
Added Files:
src/sys/compat/linux/arch/alpha: linux_osf1.c linux_osf1.h
Log Message:
Remove Alpha's compat_linux dependency on compat_osf1. Each function is
copied as-is from compat_osf1 with no functional change. Discussed on
tech-kern@, ok @thorpej.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/arch/alpha/files.linux_alpha
cvs rdiff -u -r0 -r1.1 src/sys/compat/linux/arch/alpha/linux_osf1.c \
src/sys/compat/linux/arch/alpha/linux_osf1.h
cvs rdiff -u -r1.94 -r1.95 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/osf1/files.osf1
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/alpha/files.linux_alpha
diff -u src/sys/compat/linux/arch/alpha/files.linux_alpha:1.9 src/sys/compat/linux/arch/alpha/files.linux_alpha:1.10
--- src/sys/compat/linux/arch/alpha/files.linux_alpha:1.9 Tue May 31 20:53:13 2011
+++ src/sys/compat/linux/arch/alpha/files.linux_alpha Sun Mar 24 16:24:19 2019
@@ -1,8 +1,9 @@
-# $NetBSD: files.linux_alpha,v 1.9 2011/05/31 20:53:13 njoly Exp $
+# $NetBSD: files.linux_alpha,v 1.10 2019/03/24 16:24:19 maxv Exp $
#
# Config file description for alpha-dependent Linux compat code.
file compat/linux/arch/alpha/linux_machdep.c compat_linux
+file compat/linux/arch/alpha/linux_osf1.c compat_linux
file compat/linux/arch/alpha/linux_pipe.c compat_linux
file compat/linux/arch/alpha/linux_syscalls.c compat_linux
file compat/linux/arch/alpha/linux_sysent.c compat_linux
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.94 src/sys/compat/linux/arch/alpha/syscalls.master:1.95
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.94 Fri Feb 3 16:17:08 2017
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sun Mar 24 16:24:19 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.94 2017/02/03 16:17:08 christos Exp $
+ $NetBSD: syscalls.master,v 1.95 2019/03/24 16:24:19 maxv Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -78,6 +78,7 @@
;#include
#include
+#include
%%
@@ -89,7 +90,7 @@
size_t nbyte); }
5 UNIMPL
6 NOARGS { int|sys||close(int fd); }
-7 NODEF { int|osf1_sys||wait4(int pid, int *status, \
+7 STD { int|linux_sys||osf1_wait4(int pid, int *status, \
int options, struct osf1_rusage *rusage); }
;8 ALIAS osf1_sys_old_creat, NOT USED
8 STD { int|linux_sys||creat(const char *path, linux_umode_t mode); }
@@ -109,7 +110,7 @@
19 NOARGS { long|compat_43_sys||lseek(int fd, long offset, \
int whence); }
20 NOARGS { pid_t|sys||getpid_with_ppid(void); }
-21 NODEF { int|osf1_sys||mount(int type, const char *path, \
+21 STD { int|linux_sys||osf1_mount(int type, const char *path, \
int flags, void *data); }
22 UNIMPL umount
23 NOARGS { int|sys||setuid(uid_t uid); }
@@ -133,7 +134,7 @@
40 UNIMPL
41 NOARGS { int|sys||dup(int fd); }
42 NOARGS { int|linux_sys||pipe(void); }
-43 NODEF { int|osf1_sys||set_program_attributes( \
+43 STD { int|linux_sys||osf1_set_program_attributes( \
void *taddr, unsigned long tsize, \
void *daddr, unsigned long dsize); }
44 UNIMPL
@@ -187,7 +188,7 @@
80 NOARGS { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
81 UNIMPL
82 UNIMPL setpgrp
-83 NODEF { int|osf1_sys||setitimer(int which, \
+83 STD { int|linux_sys||osf1_setitimer(int which, \
struct osf1_itimerval *itv, \
struct osf1_itimerval *oitv); }
84 UNIMPL
@@ -201,7 +202,7 @@
90 NOARGS { int|sys||dup2(int from, int to); }
91 STD { int|linux_sys||fstat(int fd, struct linux_stat *sp); }
92 STD { int|linux_sys||fcntl(int fd, int cmd, void *arg); }
-93 NODEF { int|osf1_sys||select(u_int nd, fd_set *in, \
+93 STD { int|linux_sys||osf1_select(u_int nd, fd_set *in, \
fd_set *ou, fd_set *ex, struct osf1_timeval *tv); }
94 NOARGS { int|sys||poll(struct pollfd *fds, u_int nfds, \
int timeout); }
@@ -242,9 +243,9 @@
114 STD { ssize_t|linux_sys||sendmsg(int s, \
const struct linux_msghdr *msg, int flags); }
115 UNIMPL
-116 NODEF { int|osf1_sys||gettimeofday(struct osf1_timeval *tv, \
+116 STD { int|linux_sys||osf1_gettimeofday(struct osf1_timeval *tv, \
struct osf1_timezone *tzp); }
-117 NODEF { int|osf1_sys||getrusage(int who, \
+117 STD { int|linux_sys||osf1_getrusage(int who, \
struct osf1_rusage *rusage); }
118 STD { int|linux_sys||getsockopt(int s, int level, \
int optname, void *optval, int *optlen); }
@@ -253,7 +254,7 @@
int iovcnt); }
121 NOARGS { ssize_t|sys||writev(int fd, const struct iovec *iovp, \
int iovcnt); }
-122 NODEF {
CVS commit: src/sys/compat
Module Name:src Committed By: maxv Date: Sun Mar 24 16:24:20 UTC 2019 Modified Files: src/sys/compat/linux/arch/alpha: files.linux_alpha syscalls.master src/sys/compat/osf1: files.osf1 Added Files: src/sys/compat/linux/arch/alpha: linux_osf1.c linux_osf1.h Log Message: Remove Alpha's compat_linux dependency on compat_osf1. Each function is copied as-is from compat_osf1 with no functional change. Discussed on tech-kern@, ok @thorpej. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/arch/alpha/files.linux_alpha cvs rdiff -u -r0 -r1.1 src/sys/compat/linux/arch/alpha/linux_osf1.c \ src/sys/compat/linux/arch/alpha/linux_osf1.h cvs rdiff -u -r1.94 -r1.95 src/sys/compat/linux/arch/alpha/syscalls.master cvs rdiff -u -r1.21 -r1.22 src/sys/compat/osf1/files.osf1 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/osf1
The point was that Max wants to remove compat_osf1 and this is the first step. The second step would be to remove all the unneeded files and fix syscalls.master to instantiate the syscall array. christos > On Mar 17, 2019, at 5:34 PM, Paul Goyette wrote: > > On Sun, 17 Mar 2019, Christos Zoulas wrote: > >> Module Name: src >> Committed By:christos >> Date:Sun Mar 17 14:11:49 UTC 2019 >> >> Modified Files: >> src/sys/compat/osf1: files.osf1 >> >> Log Message: >> fix the build: include the needed osf1 files for compat_linux on alpha > > > This will handle the situation where COMPAT_OSF1 is built-in to the kernel > without includine COMPAT_LINUX. > > But it does not handle the situation where COMPAT_OSF1 andCOMPAT_LINUX are > both omitted from the kernel and loaded as non-built-in modules. > > For the latter situation, we need a way for compat_linux.kmod to require > compat_osf1.kmod. It's not sufficient to simply add the linux files to the > osf1 module's Makefile as that would result in duplicated symbols between the > two modules (preventing both from being loaded at the same time). > > > ++--+---+ > | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | > | (Retired) | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com | > | Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org | > ++--+---+
Re: CVS commit: src/sys/compat/osf1
On Sun, 17 Mar 2019, Christos Zoulas wrote: Module Name:src Committed By: christos Date: Sun Mar 17 14:11:49 UTC 2019 Modified Files: src/sys/compat/osf1: files.osf1 Log Message: fix the build: include the needed osf1 files for compat_linux on alpha This will handle the situation where COMPAT_OSF1 is built-in to the kernel without includine COMPAT_LINUX. But it does not handle the situation where COMPAT_OSF1 andCOMPAT_LINUX are both omitted from the kernel and loaded as non-built-in modules. For the latter situation, we need a way for compat_linux.kmod to require compat_osf1.kmod. It's not sufficient to simply add the linux files to the osf1 module's Makefile as that would result in duplicated symbols between the two modules (preventing both from being loaded at the same time). ++--+---+ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired) | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com | | Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org | ++--+---+
CVS commit: src/sys/compat/osf1
Module Name:src Committed By: christos Date: Sun Mar 17 14:11:49 UTC 2019 Modified Files: src/sys/compat/osf1: files.osf1 Log Message: fix the build: include the needed osf1 files for compat_linux on alpha To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/compat/osf1/files.osf1 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/files.osf1 diff -u src/sys/compat/osf1/files.osf1:1.20 src/sys/compat/osf1/files.osf1:1.21 --- src/sys/compat/osf1/files.osf1:1.20 Sun Nov 16 20:01:57 2014 +++ src/sys/compat/osf1/files.osf1 Sun Mar 17 10:11:48 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.osf1,v 1.20 2014/11/17 01:01:57 uebayasi Exp $ +# $NetBSD: files.osf1,v 1.21 2019/03/17 14:11:48 christos Exp $ # # Config file description for machine-independent OSF/1 compat code. # Included by ports that need it. @@ -15,24 +15,24 @@ file compat/osf1/osf1_syscalls.c compat_ file compat/osf1/osf1_sysent.c compat_osf1 # OSF/1 <-> NetBSD structure, flag, and value conversion files -file compat/osf1/osf1_cvt.c compat_osf1 +file compat/osf1/osf1_cvt.c compat_osf1 | compat_linux file compat/osf1/osf1_errno.c compat_osf1 -file compat/osf1/osf1_signo.c compat_osf1 +file compat/osf1/osf1_signo.c compat_osf1 | compat_linux # functionality emulation files file compat/osf1/osf1_descrip.c compat_osf1 file compat/osf1/osf1_exec.c compat_osf1 file compat/osf1/osf1_exec_ecoff.c compat_osf1 & exec_ecoff -file compat/osf1/osf1_file.c compat_osf1 -file compat/osf1/osf1_generic.c compat_osf1 +file compat/osf1/osf1_file.c compat_osf1 | compat_linux +file compat/osf1/osf1_generic.c compat_osf1 | compat_linux file compat/osf1/osf1_ioctl.c compat_osf1 -file compat/osf1/osf1_misc.c compat_osf1 +file compat/osf1/osf1_misc.c compat_osf1 | compat_linux file compat/osf1/osf1_mmap.c compat_osf1 file compat/osf1/osf1_mod.c compat_osf1 -file compat/osf1/osf1_mount.c compat_osf1 +file compat/osf1/osf1_mount.c compat_osf1 | compat_linux file compat/osf1/osf1_prot.c compat_osf1 -file compat/osf1/osf1_resource.c compat_osf1 +file compat/osf1/osf1_resource.c compat_osf1 | compat_linux file compat/osf1/osf1_signal.c compat_osf1 file compat/osf1/osf1_socket.c compat_osf1 file compat/osf1/osf1_sysv_ipc.c compat_osf1 -file compat/osf1/osf1_time.c compat_osf1 +file compat/osf1/osf1_time.c compat_osf1 | compat_linux
CVS commit: src/sys/compat/osf1
Module Name:src Committed By: christos Date: Sun Mar 17 14:11:49 UTC 2019 Modified Files: src/sys/compat/osf1: files.osf1 Log Message: fix the build: include the needed osf1 files for compat_linux on alpha To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/compat/osf1/files.osf1 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: pgoyette
Date: Sun Mar 3 22:26:58 UTC 2019
Modified Files:
src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h
ultrix_syscalls.c ultrix_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/ultrix/ultrix_syscall.h
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscallargs.h
cvs rdiff -u -r1.73 -r1.74 src/sys/compat/ultrix/ultrix_syscalls.c
cvs rdiff -u -r1.76 -r1.77 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/ultrix_syscall.h
diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.74 src/sys/compat/ultrix/ultrix_syscall.h:1.75
--- src/sys/compat/ultrix/ultrix_syscall.h:1.74 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/ultrix_syscall.h Sun Mar 3 22:26:58 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscall.h,v 1.74 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscall.h,v 1.75 2019/03/03 22:26:58 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALL_H_
@@ -387,15 +387,12 @@
/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
#define ULTRIX_SYS_getfh 164
-#if defined(COMPAT_09)
/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_getdomainname 165
/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_setdomainname 166
-#else
-#endif
/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */
#define ULTRIX_SYS_quotactl 168
Index: src/sys/compat/ultrix/ultrix_syscallargs.h
diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.69 src/sys/compat/ultrix/ultrix_syscallargs.h:1.70
--- src/sys/compat/ultrix/ultrix_syscallargs.h:1.69 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/ultrix_syscallargs.h Sun Mar 3 22:26:58 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscallargs.h,v 1.69 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscallargs.h,v 1.70 2019/03/03 22:26:58 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALLARGS_H_
@@ -357,13 +357,10 @@ struct ultrix_sys_fstatfs_args {
check_syscall_args(ultrix_sys_fstatfs)
struct compat_30_sys_getfh_args;
-#if defined(COMPAT_09)
struct compat_09_sys_getdomainname_args;
struct compat_09_sys_setdomainname_args;
-#else
-#endif
struct ultrix_sys_quotactl_args {
syscallarg(int) cmd;
@@ -678,13 +675,10 @@ int ultrix_sys_fstatfs(struct lwp *, con
int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *);
-#if defined(COMPAT_09)
int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *);
int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *);
-#else
-#endif
int ultrix_sys_quotactl(struct lwp *, const struct ultrix_sys_quotactl_args *, register_t *);
int ultrix_sys_exportfs(struct lwp *, const struct ultrix_sys_exportfs_args *, register_t *);
Index: src/sys/compat/ultrix/ultrix_syscalls.c
diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.73 src/sys/compat/ultrix/ultrix_syscalls.c:1.74
--- src/sys/compat/ultrix/ultrix_syscalls.c:1.73 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/ultrix_syscalls.c Sun Mar 3 22:26:58 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: ultrix_syscalls.c,v 1.73 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscalls.c,v 1.74 2019/03/03 22:26:58 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.73 2019/01/27 02:08:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.74 2019/03/03 22:26:58 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -193,13 +193,8 @@ const char *const ultrix_syscallnames[]
/* 162 */ "#162 (unimplemented umount)",
/* 163 */ "#163 (unimplemented async_daemon)",
/* 164 */ "getfh",
-#if defined(COMPAT_09)
/* 165 */ "getdomainname",
/* 166 */ "setdomainname",
-#else
- /* 165 */ "#165 (unimplemented compat_09_sys_getdomainname)",
- /* 166 */ "#166 (unimplemented compat_09_sys_setdomainname)",
-#endif
/* 167 */ "#167
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: pgoyette Date: Sun Mar 3 22:26:58 UTC 2019 Modified Files: src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.73 -r1.74 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.76 -r1.77 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: pgoyette
Date: Sun Mar 3 22:26:30 UTC 2019
Modified Files:
src/sys/compat/ultrix: syscalls.master
Log Message:
The compat_09_{get,set}domainname() syscalls should not be defined
based on existence of COMPAT_09. Make them modular instead, and
reference the compat_09 module.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/compat/ultrix/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/ultrix
Module Name:src
Committed By: pgoyette
Date: Sun Mar 3 22:26:30 UTC 2019
Modified Files:
src/sys/compat/ultrix: syscalls.master
Log Message:
The compat_09_{get,set}domainname() syscalls should not be defined
based on existence of COMPAT_09. Make them modular instead, and
reference the compat_09 module.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/compat/ultrix/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/ultrix/syscalls.master
diff -u src/sys/compat/ultrix/syscalls.master:1.57 src/sys/compat/ultrix/syscalls.master:1.58
--- src/sys/compat/ultrix/syscalls.master:1.57 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/syscalls.master Sun Mar 3 22:26:30 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.57 2019/01/27 02:08:41 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -255,15 +255,12 @@
162 UNIMPL umount
163 UNIMPL async_daemon
164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
-#if defined(COMPAT_09)
-165 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
+165 NOARGS MODULAR compat_09 \
+ { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
-166 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
+166 NOARGS MODULAR compat_09 \
+ { int|compat_09_sys||setdomainname(char *domainname, \
int len); }
-#else
-165 UNIMPL compat_09_sys_getdomainname
-166 UNIMPL compat_09_sys_setdomainname
-#endif
167 UNIMPL
168 STD { int|ultrix_sys||quotactl(int cmd, char *special, \
int uid, void *addr); }
CVS commit: src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sun Mar 3 22:25:00 UTC 2019
Modified Files:
src/sys/compat/ultrix: ultrix_mod.c
Log Message:
Fix the required-list for compat_ultrix. With the merge of the
[pgoyette-compat] branch there is no longer a "compat" module;
instead we have lots of version-specific compat_xx modules.
Code inspection shows compat_ultrix uses compat_13 (and newer)
stuff, so set the requirements list accordingly.
Should fix PR port-pmax/54037
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/ultrix/ultrix_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/ultrix/ultrix_mod.c
diff -u src/sys/compat/ultrix/ultrix_mod.c:1.5 src/sys/compat/ultrix/ultrix_mod.c:1.6
--- src/sys/compat/ultrix/ultrix_mod.c:1.5 Fri Mar 7 01:33:44 2014
+++ src/sys/compat/ultrix/ultrix_mod.c Sun Mar 3 22:25:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_mod.c,v 1.5 2014/03/07 01:33:44 christos Exp $ */
+/* $NetBSD: ultrix_mod.c,v 1.6 2019/03/03 22:25:00 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.5 2014/03/07 01:33:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.6 2019/03/03 22:25:00 pgoyette Exp $");
#include
#include
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c
#define MD1 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_ultrix, "compat" MD1);
+MODULE(MODULE_CLASS_EXEC, compat_ultrix, "compat_13" MD1);
static struct execsw ultrix_execsw[] = {
#ifdef EXEC_ECOFF
CVS commit: src/sys/compat/ultrix
Module Name:src Committed By: pgoyette Date: Sun Mar 3 22:25:00 UTC 2019 Modified Files: src/sys/compat/ultrix: ultrix_mod.c Log Message: Fix the required-list for compat_ultrix. With the merge of the [pgoyette-compat] branch there is no longer a "compat" module; instead we have lots of version-specific compat_xx modules. Code inspection shows compat_ultrix uses compat_13 (and newer) stuff, so set the requirements list accordingly. Should fix PR port-pmax/54037 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/ultrix/ultrix_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/netbsd32
Module Name:src Committed By: mrg Date: Wed Feb 27 03:01:08 UTC 2019 Removed Files: src/sys/compat/netbsd32: netbsd32_compat_14.c Log Message: this file was moved to netbsd32_compat_14_sysv.c. To generate a diff of this commit: cvs rdiff -u -r1.29 -r0 src/sys/compat/netbsd32/netbsd32_compat_14.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: Wed Feb 27 03:01:08 UTC 2019 Removed Files: src/sys/compat/netbsd32: netbsd32_compat_14.c Log Message: this file was moved to netbsd32_compat_14_sysv.c. To generate a diff of this commit: cvs rdiff -u -r1.29 -r0 src/sys/compat/netbsd32/netbsd32_compat_14.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: rin Date: Tue Feb 26 06:28:43 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_exec_elf32.c Log Message: Push AT_STACKBASE. Otherwise, pthread_attr_getstack(3) cannot find the stack address for initial thread (LID 1). Now, rust for i386 and armv7 work on amd64 and aarch64, respectively. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/netbsd32_exec_elf32.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: rin Date: Tue Feb 26 06:28:43 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_exec_elf32.c Log Message: Push AT_STACKBASE. Otherwise, pthread_attr_getstack(3) cannot find the stack address for initial thread (LID 1). Now, rust for i386 and armv7 work on amd64 and aarch64, respectively. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/netbsd32_exec_elf32.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_exec_elf32.c diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.41 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.42 --- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.41 Sun Jan 27 02:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Tue Feb 26 06:28:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_exec_elf32.c,v 1.41 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_exec_elf32.c,v 1.42 2019/02/26 06:28:43 rin Exp $ */ /* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */ /* @@ -57,7 +57,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.41 2019/01/27 02:08:40 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.42 2019/02/26 06:28:43 rin Exp $"); #define ELFSIZE 32 @@ -196,6 +196,10 @@ netbsd32_elf32_copyargs(struct lwp *l, s a->a_v = kauth_cred_getgid(l->l_cred); a++; + a->a_type = AT_STACKBASE; + a->a_v = l->l_proc->p_stackbase; + a++; + exec_free_emul_arg(pack); }
CVS commit: src/sys/compat/sys
Module Name:src Committed By: mrg Date: Thu Feb 21 08:25:00 UTC 2019 Modified Files: src/sys/compat/sys: ipc.h Log Message: include libkern.h or strings.h. should fix i386 build issues. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/ipc.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: mrg Date: Thu Feb 21 08:25:00 UTC 2019 Modified Files: src/sys/compat/sys: ipc.h Log Message: include libkern.h or strings.h. should fix i386 build issues. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/sys/ipc.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/ipc.h diff -u src/sys/compat/sys/ipc.h:1.6 src/sys/compat/sys/ipc.h:1.7 --- src/sys/compat/sys/ipc.h:1.6 Thu Feb 21 03:37:19 2019 +++ src/sys/compat/sys/ipc.h Thu Feb 21 08:25:00 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ipc.h,v 1.6 2019/02/21 03:37:19 mrg Exp $ */ +/* $NetBSD: ipc.h,v 1.7 2019/02/21 08:25:00 mrg Exp $ */ /* * Copyright (c) 1990, 1993 @@ -47,6 +47,12 @@ #ifndef _COMPAT_SYS_IPC_H_ #define _COMPAT_SYS_IPC_H_ +#ifdef _KERNEL +#include +#else +#include +#endif + __BEGIN_DECLS /* * Old IPC permission structure used before NetBSD 1.5.
