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
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/freebsd
Module Name:src Committed By: pgoyette Date: Tue Feb 5 00:40:15 UTC 2019 Modified Files: src/sys/compat/freebsd: freebsd_mod.c Log Message: Update compat_freebsd requirements list to use compat_09 vs compat To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/compat/freebsd/freebsd_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/freebsd
Module Name:src
Committed By: pgoyette
Date: Tue Feb 5 00:40:15 UTC 2019
Modified Files:
src/sys/compat/freebsd: freebsd_mod.c
Log Message:
Update compat_freebsd requirements list to use compat_09 vs compat
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/freebsd/freebsd_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/freebsd/freebsd_mod.c
diff -u src/sys/compat/freebsd/freebsd_mod.c:1.6 src/sys/compat/freebsd/freebsd_mod.c:1.7
--- src/sys/compat/freebsd/freebsd_mod.c:1.6 Sat Jul 29 10:39:48 2017
+++ src/sys/compat/freebsd/freebsd_mod.c Tue Feb 5 00:40:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_mod.c,v 1.6 2017/07/29 10:39:48 maxv Exp $ */
+/* $NetBSD: freebsd_mod.c,v 1.7 2019/02/05 00:40:15 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_mod.c,v 1.6 2017/07/29 10:39:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_mod.c,v 1.7 2019/02/05 00:40:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_mod.
#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
-MODULE(MODULE_CLASS_EXEC, compat_freebsd, "compat,compat_ossaudio" MD1);
+MODULE(MODULE_CLASS_EXEC, compat_freebsd, "compat_09,compat_ossaudio" MD1);
static struct execsw freebsd_execsw[] = {
#ifdef EXEC_ELF32
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kamil Date: Tue Dec 19 19:18:18 UTC 2017 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master Log Message: compat/freebsd: Drop SYS_vadvise The (o)vadvise syscall is dummy since the beginning of NetBSD. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.70 -r1.71 src/sys/compat/freebsd/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: kamil
Date: Tue Dec 19 19:18:18 UTC 2017
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c syscalls.master
Log Message:
compat/freebsd: Drop SYS_vadvise
The (o)vadvise syscall is dummy since the beginning of NetBSD.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/freebsd/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.86 src/sys/compat/freebsd/freebsd_syscall.h:1.87
--- src/sys/compat/freebsd/freebsd_syscall.h:1.86 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_syscall.h Tue Dec 19 19:18:18 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.86 2017/12/19 18:15:08 kamil Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.87 2017/12/19 19:18:18 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -222,9 +222,7 @@
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define FREEBSD_SYS_ommap 71
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define FREEBSD_SYS_vadvise 72
-
+/* 72 is obsolete vadvise */
/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
#define FREEBSD_SYS_munmap 73
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.89 src/sys/compat/freebsd/freebsd_syscallargs.h:1.90
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.89 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Tue Dec 19 19:18:18 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.90 2017/12/19 19:18:18 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -167,8 +167,6 @@ check_syscall_args(freebsd_sys_msync)
struct compat_43_sys_mmap_args;
-struct sys_ovadvise_args;
-
struct sys_munmap_args;
struct sys_mprotect_args;
@@ -738,8 +736,6 @@ int sys_vfork(struct lwp *, const void *
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
-int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
-
int sys_munmap(struct lwp *, const struct sys_munmap_args *, register_t *);
int sys_mprotect(struct lwp *, const struct sys_mprotect_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.89 src/sys/compat/freebsd/freebsd_sysent.c:1.90
--- src/sys/compat/freebsd/freebsd_sysent.c:1.89 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_sysent.c Tue Dec 19 19:18:18 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.90 2017/12/19 19:18:18 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.70 2017/12/19 18:15:08 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.90 2017/12/19 19:18:18 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -351,9 +351,8 @@ struct sysent freebsd_sysent[] = {
.sy_call = (sy_call_t *)compat_43_sys_mmap
}, /* 71 = ommap */
{
- ns(struct sys_ovadvise_args),
- .sy_call = (sy_call_t *)sys_ovadvise
- }, /* 72 = vadvise */
+ .sy_call = sys_nosys,
+ }, /* 72 = filler */
{
ns(struct sys_munmap_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.87 src/sys/compat/freebsd/freebsd_syscalls.c:1.88
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.87 Tue Dec 19 18:15:08 2017
+++ src/sys/compat/freebsd/freebsd_syscalls.c Tue Dec 19 19:18:18 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.87 2017/12/19 18:15:08 kamil Exp $ */
+/*
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kamil Date: Tue Dec 19 18:15:08 UTC 2017 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master Log Message: compat/freebsd: Drop SYS_sbrk sbrk - change data segment size This syscall is dummy since the inception of the project. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.88 -r1.89 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.69 -r1.70 src/sys/compat/freebsd/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: kamil
Date: Tue Dec 19 18:15:08 UTC 2017
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c syscalls.master
Log Message:
compat/freebsd: Drop SYS_sbrk
sbrk - change data segment size
This syscall is dummy since the inception of the project.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/freebsd/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.85 src/sys/compat/freebsd/freebsd_syscall.h:1.86
--- src/sys/compat/freebsd/freebsd_syscall.h:1.85 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_syscall.h Tue Dec 19 18:15:08 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.85 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.86 2017/12/19 18:15:08 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
+ * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -217,9 +217,7 @@
/* 67 is obsolete vread */
/* 68 is obsolete vwrite */
-/* syscall: "sbrk" ret: "int" args: "intptr_t" */
-#define FREEBSD_SYS_sbrk 69
-
+/* 69 is obsolete sbrk */
/* 70 is obsolete sstk */
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define FREEBSD_SYS_ommap 71
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.88 src/sys/compat/freebsd/freebsd_syscallargs.h:1.89
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.88 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Tue Dec 19 18:15:08 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
+ * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -165,8 +165,6 @@ struct freebsd_sys_msync_args {
};
check_syscall_args(freebsd_sys_msync)
-struct sys_sbrk_args;
-
struct compat_43_sys_mmap_args;
struct sys_ovadvise_args;
@@ -738,8 +736,6 @@ int freebsd_sys_msync(struct lwp *, cons
int sys_vfork(struct lwp *, const void *, register_t *);
-int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.88 src/sys/compat/freebsd/freebsd_sysent.c:1.89
--- src/sys/compat/freebsd/freebsd_sysent.c:1.88 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_sysent.c Tue Dec 19 18:15:08 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
+ * created from NetBSD: syscalls.master,v 1.69 2017/12/19 08:27:05 kamil Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.89 2017/12/19 18:15:08 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -340,9 +340,8 @@ struct sysent freebsd_sysent[] = {
.sy_call = sys_nosys,
}, /* 68 = filler */
{
- ns(struct sys_sbrk_args),
- .sy_call = (sy_call_t *)sys_sbrk
- }, /* 69 = sbrk */
+ .sy_call = sys_nosys,
+ }, /* 69 = filler */
{
.sy_call = sys_nosys,
}, /* 70 = filler */
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.86 src/sys/compat/freebsd/freebsd_syscalls.c:1.87
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.86 Tue Dec 19 08:27:05 2017
+++ src/sys/compat/freebsd/freebsd_syscalls.c Tue Dec 19 18:15:08 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.86 2017/12/19 08:27:05 kamil Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.87 2017/12/19
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: kamil Date: Tue Dec 19 08:27:05 UTC 2017 Modified Files: src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c syscalls.master Log Message: compat freebsd: Drop the sstk(2) syscall sstk(2) has never been implemented by the NetBSD kernel. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/compat/freebsd/freebsd_syscall.h cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscallargs.h \ src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.68 -r1.69 src/sys/compat/freebsd/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: kamil
Date: Tue Dec 19 08:27:05 UTC 2017
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c syscalls.master
Log Message:
compat freebsd: Drop the sstk(2) syscall
sstk(2) has never been implemented by the NetBSD kernel.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.85 -r1.86 src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/freebsd/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.84 src/sys/compat/freebsd/freebsd_syscall.h:1.85
--- src/sys/compat/freebsd/freebsd_syscall.h:1.84 Wed May 10 06:19:48 2017
+++ src/sys/compat/freebsd/freebsd_syscall.h Tue Dec 19 08:27:05 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.84 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.85 2017/12/19 08:27:05 kamil Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2013/11/07 19:37:18 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -220,9 +220,7 @@
/* syscall: "sbrk" ret: "int" args: "intptr_t" */
#define FREEBSD_SYS_sbrk 69
-/* syscall: "sstk" ret: "int" args: "int" */
-#define FREEBSD_SYS_sstk 70
-
+/* 70 is obsolete sstk */
/* syscall: "ommap" ret: "int" args: "void *" "size_t" "int" "int" "int" "long" */
#define FREEBSD_SYS_ommap 71
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.87 src/sys/compat/freebsd/freebsd_syscallargs.h:1.88
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.87 Wed May 10 06:19:48 2017
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Tue Dec 19 08:27:05 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.87 2017/05/10 06:19:48 riastradh Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2013/11/07 19:37:18 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -167,8 +167,6 @@ check_syscall_args(freebsd_sys_msync)
struct sys_sbrk_args;
-struct sys_sstk_args;
-
struct compat_43_sys_mmap_args;
struct sys_ovadvise_args;
@@ -742,8 +740,6 @@ int sys_vfork(struct lwp *, const void *
int sys_sbrk(struct lwp *, const struct sys_sbrk_args *, register_t *);
-int sys_sstk(struct lwp *, const struct sys_sstk_args *, register_t *);
-
int compat_43_sys_mmap(struct lwp *, const struct compat_43_sys_mmap_args *, register_t *);
int sys_ovadvise(struct lwp *, const struct sys_ovadvise_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.87 src/sys/compat/freebsd/freebsd_sysent.c:1.88
--- src/sys/compat/freebsd/freebsd_sysent.c:1.87 Tue Aug 8 08:04:06 2017
+++ src/sys/compat/freebsd/freebsd_sysent.c Tue Dec 19 08:27:05 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_sysent.c,v 1.87 2017/08/08 08:04:06 maxv Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2013/11/07 19:37:18 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2017/08/08 08:04:06 maxv Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.87 2017/08/08 08:04:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.88 2017/12/19 08:27:05 kamil Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -344,9 +344,8 @@ struct sysent freebsd_sysent[] = {
.sy_call = (sy_call_t *)sys_sbrk
}, /* 69 = sbrk */
{
- ns(struct sys_sstk_args),
- .sy_call = (sy_call_t *)sys_sstk
- }, /* 70 = sstk */
+ .sy_call = sys_nosys,
+ }, /* 70 = filler */
{
ns(struct compat_43_sys_mmap_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.85 src/sys/compat/freebsd/freebsd_syscalls.c:1.86
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.85 Tue Aug 8 08:04:06 2017
+++ src/sys/compat/freebsd/freebsd_syscalls.c Tue Dec 19 08:27:05 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.85 2017/08/08 08:04:06 maxv Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.86 2017/12/19 08:27:05
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: christos Date: Thu Sep 24 14:40:28 UTC 2015 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.80 -r1.81 src/sys/compat/freebsd/freebsd_syscall.h \ src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.83 -r1.84 src/sys/compat/freebsd/freebsd_syscallargs.h cvs rdiff -u -r1.82 -r1.83 src/sys/compat/freebsd/freebsd_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: christos
Date: Thu Sep 24 14:40:28 UTC 2015
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.80 -r1.81 src/sys/compat/freebsd/freebsd_syscall.h \
src/sys/compat/freebsd/freebsd_syscalls.c
cvs rdiff -u -r1.83 -r1.84 src/sys/compat/freebsd/freebsd_syscallargs.h
cvs rdiff -u -r1.82 -r1.83 src/sys/compat/freebsd/freebsd_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/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.80 src/sys/compat/freebsd/freebsd_syscall.h:1.81
--- src/sys/compat/freebsd/freebsd_syscall.h:1.80 Sat Mar 7 11:41:53 2015
+++ src/sys/compat/freebsd/freebsd_syscall.h Thu Sep 24 10:40:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_syscall.h,v 1.80 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.81 2015/09/24 14:40:28 christos Exp $ */
/*
* System call numbers.
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.80 src/sys/compat/freebsd/freebsd_syscalls.c:1.81
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.80 Sat Mar 7 11:41:53 2015
+++ src/sys/compat/freebsd/freebsd_syscalls.c Thu Sep 24 10:40:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.80 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.81 2015/09/24 14:40:28 christos Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.80 2015/03/07 16:41:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.81 2015/09/24 14:40:28 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -26,6 +26,8 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_sysc
#include
#include
#include
+#else /* _KERNEL_OPT */
+#include
#endif /* _KERNEL_OPT */
const char *const freebsd_syscallnames[] = {
@@ -595,3 +597,573 @@ const char *const freebsd_syscallnames[]
/* 510 */ "# filler",
/* 511 */ "# filler",
};
+
+
+/* libc style syscall names */
+const char *const altfreebsd_syscallnames[] = {
+ /* 0 */ "nosys",
+ /* 1 */ NULL, /* exit */
+ /* 2 */ NULL, /* fork */
+ /* 3 */ NULL, /* read */
+ /* 4 */ NULL, /* write */
+ /* 5 */ NULL, /* open */
+ /* 6 */ NULL, /* close */
+ /* 7 */ NULL, /* wait4 */
+ /* 8 */ "creat",
+ /* 9 */ NULL, /* link */
+ /* 10 */ NULL, /* unlink */
+ /* 11 */ NULL, /* obsolete execv */
+ /* 12 */ NULL, /* chdir */
+ /* 13 */ NULL, /* fchdir */
+ /* 14 */ NULL, /* mknod */
+ /* 15 */ NULL, /* chmod */
+ /* 16 */ NULL, /* chown */
+ /* 17 */ "obreak",
+ /* 18 */ NULL, /* getfsstat */
+ /* 19 */ "lseek",
+ /* 20 */ NULL, /* getpid_with_ppid */
+ /* 21 */ NULL, /* mount */
+ /* 22 */ NULL, /* unmount */
+ /* 23 */ NULL, /* setuid */
+ /* 24 */ NULL, /* getuid_with_euid */
+ /* 25 */ NULL, /* geteuid */
+ /* 26 */ NULL, /* ptrace */
+ /* 27 */ NULL, /* recvmsg */
+ /* 28 */ NULL, /* sendmsg */
+ /* 29 */ NULL, /* recvfrom */
+ /* 30 */ NULL, /* accept */
+ /* 31 */ NULL, /* getpeername */
+ /* 32 */ NULL, /* getsockname */
+ /* 33 */ NULL, /* access */
+ /* 34 */ NULL, /* chflags */
+ /* 35 */ NULL, /* fchflags */
+ /* 36 */ NULL, /* sync */
+ /* 37 */ NULL, /* kill */
+ /* 38 */ "stat",
+ /* 39 */ NULL, /* getppid */
+ /* 40 */ "lstat",
+ /* 41 */ NULL, /* dup */
+ /* 42 */ NULL, /* pipe */
+ /* 43 */ NULL, /* getegid */
+ /* 44 */ NULL, /* profil */
+#ifdef KTRACE
+ /* 45 */ NULL, /* ktrace */
+#else
+ /* 45 */ NULL, /* excluded ktrace */
+#endif
+ /* 46 */ NULL, /* sigaction */
+ /* 47 */ NULL, /* getgid_with_egid */
+ /* 48 */ NULL, /* sigprocmask */
+ /* 49 */ NULL, /* __getlogin */
+ /* 50 */ NULL, /* __setlogin */
+ /* 51 */ NULL, /* acct */
+ /* 52 */ NULL, /* sigpending */
+ /* 53 */ NULL, /* sigaltstack */
+ /* 54 */ NULL, /* ioctl */
+ /* 55 */ "reboot",
+ /* 56 */ NULL, /* revoke */
+ /* 57 */ NULL, /* symlink */
+ /* 58 */ NULL, /* readlink */
+ /* 59 */ NULL, /* execve */
+ /* 60 */ NULL, /* umask */
+ /* 61 */ NULL, /* chroot */
+ /* 62 */ "fstat",
+ /* 63 */ "getkerninfo",
+ /* 64 */ "getpagesize",
+ /* 65 */ NULL, /* msync */
+ /* 66 */ NULL, /* vfork */
+ /* 67 */ NULL, /* obsolete vread */
+ /* 68 */ NULL, /* obsolete vwrite */
+ /* 69 */ NULL, /* sbrk */
+ /* 70 */ NULL, /* sstk */
+ /* 71 */ "mmap",
+ /* 72 */ "ovadvise",
+ /* 73 */ NULL, /* munmap */
+ /* 74 */ NULL, /* mprotect */
+ /* 75 */ NULL, /* madvise */
+ /* 76 */ NULL, /* obsolete vhangup */
+ /* 77 */ NULL, /* obsolete vlimit */
+ /* 78 */ NULL, /* mincore */
+ /* 79 */ NULL, /* getgroups */
+ /* 80 */ NULL, /* setgroups */
+ /* 81 */ NULL, /* getpgrp */
+ /* 82 */ NULL, /* setpgid */
+ /* 83 */ NULL, /*
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: dholland Date: Sat Feb 14 07:37:19 UTC 2015 Modified Files: src/sys/compat/freebsd: freebsd_sysctl.c Log Message: typo in comment To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/freebsd/freebsd_sysctl.c diff -u src/sys/compat/freebsd/freebsd_sysctl.c:1.18 src/sys/compat/freebsd/freebsd_sysctl.c:1.19 --- src/sys/compat/freebsd/freebsd_sysctl.c:1.18 Sat Oct 18 08:33:27 2014 +++ src/sys/compat/freebsd/freebsd_sysctl.c Sat Feb 14 07:37:19 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sysctl.c,v 1.18 2014/10/18 08:33:27 snj Exp $ */ +/* $NetBSD: freebsd_sysctl.c,v 1.19 2015/02/14 07:37:19 dholland Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.18 2014/10/18 08:33:27 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.19 2015/02/14 07:37:19 dholland Exp $); #include sys/param.h #include sys/systm.h @@ -111,7 +111,7 @@ freebsd_sys_sysctl(struct lwp *l, const /* * FreeBSD sysctl uses an undocumented set of special OIDs in its * sysctl MIB whose tree is rooted at oid 0. These OIDs are - * interpretted by their sysctl to implement functions that NetBSD + * interpreted by their sysctl to implement functions that NetBSD * performs in libc, such as sysctlgetmibinfo. * * From the FreeBSD kern_sysctl.c, these OIDs are:
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: dholland Date: Sat Feb 14 07:37:19 UTC 2015 Modified Files: src/sys/compat/freebsd: freebsd_sysctl.c Log Message: typo in comment To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Sun Nov 9 18:30:39 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_exec_elf32.c freebsd_file.c freebsd_ipc.c freebsd_misc.c Log Message: Do not uselessly include sys/malloc.h. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/freebsd/freebsd_exec_elf32.c cvs rdiff -u -r1.32 -r1.33 src/sys/compat/freebsd/freebsd_file.c \ src/sys/compat/freebsd/freebsd_misc.c cvs rdiff -u -r1.16 -r1.17 src/sys/compat/freebsd/freebsd_ipc.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_exec_elf32.c diff -u src/sys/compat/freebsd/freebsd_exec_elf32.c:1.19 src/sys/compat/freebsd/freebsd_exec_elf32.c:1.20 --- src/sys/compat/freebsd/freebsd_exec_elf32.c:1.19 Tue Jun 24 12:17:40 2014 +++ src/sys/compat/freebsd/freebsd_exec_elf32.c Sun Nov 9 18:30:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_exec_elf32.c,v 1.19 2014/06/24 12:17:40 maxv Exp $ */ +/* $NetBSD: freebsd_exec_elf32.c,v 1.20 2014/11/09 18:30:38 maxv Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -31,12 +31,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_exec_elf32.c,v 1.19 2014/06/24 12:17:40 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_exec_elf32.c,v 1.20 2014/11/09 18:30:38 maxv Exp $); #include sys/param.h #include sys/systm.h #include sys/proc.h -#include sys/malloc.h #include sys/vnode.h #include sys/exec.h #ifndef ELFSIZE Index: src/sys/compat/freebsd/freebsd_file.c diff -u src/sys/compat/freebsd/freebsd_file.c:1.32 src/sys/compat/freebsd/freebsd_file.c:1.33 --- src/sys/compat/freebsd/freebsd_file.c:1.32 Tue Mar 2 21:14:43 2010 +++ src/sys/compat/freebsd/freebsd_file.c Sun Nov 9 18:30:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_file.c,v 1.32 2010/03/02 21:14:43 pooka Exp $ */ +/* $NetBSD: freebsd_file.c,v 1.33 2014/11/09 18:30:38 maxv Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_file.c,v 1.32 2010/03/02 21:14:43 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_file.c,v 1.33 2014/11/09 18:30:38 maxv Exp $); #include sys/param.h #include sys/systm.h @@ -46,7 +46,6 @@ __KERNEL_RCSID(0, $NetBSD: freebsd_file #include sys/ioctl.h #include sys/kernel.h #include sys/mount.h -#include sys/malloc.h #include sys/syscallargs.h Index: src/sys/compat/freebsd/freebsd_misc.c diff -u src/sys/compat/freebsd/freebsd_misc.c:1.32 src/sys/compat/freebsd/freebsd_misc.c:1.33 --- src/sys/compat/freebsd/freebsd_misc.c:1.32 Thu Dec 20 23:02:47 2007 +++ src/sys/compat/freebsd/freebsd_misc.c Sun Nov 9 18:30:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_misc.c,v 1.32 2007/12/20 23:02:47 dsl Exp $ */ +/* $NetBSD: freebsd_misc.c,v 1.33 2014/11/09 18:30:38 maxv Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_misc.c,v 1.32 2007/12/20 23:02:47 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_misc.c,v 1.33 2014/11/09 18:30:38 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_ntp.h @@ -48,7 +48,6 @@ __KERNEL_RCSID(0, $NetBSD: freebsd_misc #include sys/mount.h #include sys/signal.h #include sys/signalvar.h -#include sys/malloc.h #include sys/mman.h #include sys/ktrace.h Index: src/sys/compat/freebsd/freebsd_ipc.c diff -u src/sys/compat/freebsd/freebsd_ipc.c:1.16 src/sys/compat/freebsd/freebsd_ipc.c:1.17 --- src/sys/compat/freebsd/freebsd_ipc.c:1.16 Sun Jan 11 02:45:47 2009 +++ src/sys/compat/freebsd/freebsd_ipc.c Sun Nov 9 18:30:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_ipc.c,v 1.16 2009/01/11 02:45:47 christos Exp $ */ +/* $NetBSD: freebsd_ipc.c,v 1.17 2014/11/09 18:30:38 maxv Exp $ */ /* * Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_ipc.c,v 1.16 2009/01/11 02:45:47 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_ipc.c,v 1.17 2014/11/09 18:30:38 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_sysv.h @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, $NetBSD: freebsd_ipc. #include sys/proc.h #include sys/sem.h #include sys/shm.h -#include sys/malloc.h #include sys/mount.h #include sys/syscallargs.h
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Sun Nov 9 18:30:39 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_exec_elf32.c freebsd_file.c freebsd_ipc.c freebsd_misc.c Log Message: Do not uselessly include sys/malloc.h. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/freebsd/freebsd_exec_elf32.c cvs rdiff -u -r1.32 -r1.33 src/sys/compat/freebsd/freebsd_file.c \ src/sys/compat/freebsd/freebsd_misc.c cvs rdiff -u -r1.16 -r1.17 src/sys/compat/freebsd/freebsd_ipc.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: maxv Date: Fri Oct 10 16:29:56 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_sysctl.c Log Message: I'm not sure reading from an unsanitized userland pointer is a good idea. Some users might be tempted to give 0x01, in which case the kernel will crash. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/freebsd/freebsd_sysctl.c diff -u src/sys/compat/freebsd/freebsd_sysctl.c:1.16 src/sys/compat/freebsd/freebsd_sysctl.c:1.17 --- src/sys/compat/freebsd/freebsd_sysctl.c:1.16 Tue Feb 25 18:30:09 2014 +++ src/sys/compat/freebsd/freebsd_sysctl.c Fri Oct 10 16:29:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sysctl.c,v 1.16 2014/02/25 18:30:09 pooka Exp $ */ +/* $NetBSD: freebsd_sysctl.c,v 1.17 2014/10/10 16:29:56 maxv Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.16 2014/02/25 18:30:09 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.17 2014/10/10 16:29:56 maxv Exp $); #include sys/param.h #include sys/systm.h @@ -90,7 +90,7 @@ freebsd_sys_sysctl(struct lwp *l, const } */ int error; int name[CTL_MAXNAME]; - size_t newlen, *oldlenp; + size_t newlen, *oldlenp, oldlen; u_int namelen; void *new, *old; @@ -141,9 +141,14 @@ freebsd_sys_sysctl(struct lwp *l, const old = SCARG(uap, old); oldlenp = SCARG(uap, oldlenp); - if (old == NULL || oldlenp == NULL || *oldlenp sizeof(int)) + if (old == NULL || oldlenp == NULL) return(EINVAL); + if ((error = copyin(oldlenp, oldlen, sizeof(oldlen + return (error); + if (oldlen sizeof(int)) + return (EINVAL); + if ((locnew = (char *) malloc(newlen + 1, M_TEMP, M_WAITOK)) == NULL) return(ENOMEM); @@ -163,11 +168,11 @@ freebsd_sys_sysctl(struct lwp *l, const oidlen *= sizeof(int); error = copyout(oid, SCARG(uap, old), -MIN(oidlen, *SCARG(uap, oldlenp))); +MIN(oidlen, oldlen)); if (error) return(error); ktrmibio(-1, UIO_READ, SCARG(uap, old), - MIN(oidlen, *SCARG(uap, oldlenp)), 0); + MIN(oidlen, oldlen), 0); error = copyout(oidlen, SCARG(uap, oldlenp), sizeof(u_int));
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Fri Oct 10 16:29:56 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_sysctl.c Log Message: I'm not sure reading from an unsanitized userland pointer is a good idea. Some users might be tempted to give 0x01, in which case the kernel will crash. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/compat/freebsd/freebsd_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Sat Jun 28 11:06:31 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_sched.c Log Message: Empy comment To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/compat/freebsd/freebsd_sched.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/freebsd/freebsd_sched.c diff -u src/sys/compat/freebsd/freebsd_sched.c:1.21 src/sys/compat/freebsd/freebsd_sched.c:1.22 --- src/sys/compat/freebsd/freebsd_sched.c:1.21 Sun Jun 22 22:19:28 2014 +++ src/sys/compat/freebsd/freebsd_sched.c Sat Jun 28 11:06:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sched.c,v 1.21 2014/06/22 22:19:28 christos Exp $ */ +/* $NetBSD: freebsd_sched.c,v 1.22 2014/06/28 11:06:31 maxv Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_sched.c,v 1.21 2014/06/22 22:19:28 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_sched.c,v 1.22 2014/06/28 11:06:31 maxv Exp $); #include sys/param.h #include sys/mount.h @@ -94,8 +94,6 @@ sched_freebsd2native(int freebsd_policy, return 0; } -/* - */ static int sched_native2freebsd(int native_policy, const struct sched_param *native_params, int *freebsd_policy, struct freebsd_sched_param *freebsd_params)
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Sat Jun 28 11:06:31 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_sched.c Log Message: Empy comment To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/compat/freebsd/freebsd_sched.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Tue Jun 24 12:17:40 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_exec_elf32.c Log Message: Remove unused headers. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/compat/freebsd/freebsd_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/freebsd/freebsd_exec_elf32.c diff -u src/sys/compat/freebsd/freebsd_exec_elf32.c:1.18 src/sys/compat/freebsd/freebsd_exec_elf32.c:1.19 --- src/sys/compat/freebsd/freebsd_exec_elf32.c:1.18 Tue Jun 24 11:59:10 2014 +++ src/sys/compat/freebsd/freebsd_exec_elf32.c Tue Jun 24 12:17:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_exec_elf32.c,v 1.18 2014/06/24 11:59:10 maxv Exp $ */ +/* $NetBSD: freebsd_exec_elf32.c,v 1.19 2014/06/24 12:17:40 maxv Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_exec_elf32.c,v 1.18 2014/06/24 11:59:10 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_exec_elf32.c,v 1.19 2014/06/24 12:17:40 maxv Exp $); #include sys/param.h #include sys/systm.h @@ -44,15 +44,11 @@ __KERNEL_RCSID(0, $NetBSD: freebsd_exec #endif /* !ELFSIZE */ #include sys/exec_elf.h -#include compat/sys/signal.h -#include compat/sys/signalvar.h - #include compat/freebsd/freebsd_exec.h #include compat/common/compat_util.h #include machine/freebsd_machdep.h - int ELFNAME2(freebsd,probe)(struct lwp *l, struct exec_package *epp, void *veh, char *itp, vaddr_t *pos)
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: maxv Date: Tue Jun 24 12:17:40 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_exec_elf32.c Log Message: Remove unused headers. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/compat/freebsd/freebsd_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/freebsd
Module Name:src
Committed By: christos
Date: Sun Jun 22 22:19:28 UTC 2014
Modified Files:
src/sys/compat/freebsd: freebsd_sched.c
Log Message:
simplify and clarify
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/freebsd/freebsd_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/freebsd/freebsd_sched.c
diff -u src/sys/compat/freebsd/freebsd_sched.c:1.20 src/sys/compat/freebsd/freebsd_sched.c:1.21
--- src/sys/compat/freebsd/freebsd_sched.c:1.20 Sat Jun 21 19:12:10 2014
+++ src/sys/compat/freebsd/freebsd_sched.c Sun Jun 22 18:19:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_sched.c,v 1.20 2014/06/21 23:12:10 christos Exp $ */
+/* $NetBSD: freebsd_sched.c,v 1.21 2014/06/22 22:19:28 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: freebsd_sched.c,v 1.20 2014/06/21 23:12:10 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: freebsd_sched.c,v 1.21 2014/06/22 22:19:28 christos Exp $);
#include sys/param.h
#include sys/mount.h
@@ -67,26 +67,26 @@ sched_freebsd2native(int freebsd_policy,
{
int p;
- if (native_policy == NULL)
- native_policy = p;
-
switch (freebsd_policy) {
case FREEBSD_SCHED_OTHER:
- *native_policy = SCHED_OTHER;
+ p = SCHED_OTHER;
break;
case FREEBSD_SCHED_FIFO:
- *native_policy = SCHED_FIFO;
+ p = SCHED_FIFO;
break;
case FREEBSD_SCHED_RR:
- *native_policy = SCHED_RR;
+ p = SCHED_RR;
break;
default:
return EINVAL;
}
+ if (native_policy != NULL)
+ *native_policy = p;
+
if (freebsd_params != NULL native_params != NULL) {
/* XXX: Needs adjustment to do a proper conversion. */
native_params-sched_priority = freebsd_params-sched_priority;
@@ -102,26 +102,26 @@ sched_native2freebsd(int native_policy,
{
int p;
- if (freebsd_policy == NULL)
- freebsd_policy = p;
-
switch (native_policy) {
case SCHED_OTHER:
- *freebsd_policy = FREEBSD_SCHED_OTHER;
+ p = FREEBSD_SCHED_OTHER;
break;
case SCHED_FIFO:
- *freebsd_policy = FREEBSD_SCHED_FIFO;
+ p = FREEBSD_SCHED_FIFO;
break;
case SCHED_RR:
- *freebsd_policy = FREEBSD_SCHED_RR;
+ p = FREEBSD_SCHED_RR;
break;
default:
return EINVAL;
}
+ if (freebsd_policy != NULL)
+ *freebsd_policy = p;
+
if (native_params != NULL freebsd_params != NULL) {
/* XXX: Needs adjustment to do a proper conversion. */
freebsd_params-sched_priority = native_params-sched_priority;
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: christos Date: Sun Jun 22 22:19:28 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_sched.c Log Message: simplify and clarify To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/compat/freebsd/freebsd_sched.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: christos
Date: Sat Jun 21 23:12:10 UTC 2014
Modified Files:
src/sys/compat/freebsd: freebsd_sched.c
Log Message:
Avoid NULL dereference and fix sched param conversion (at least make it
do something). Pointed out by Maxime Villard
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/freebsd/freebsd_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/freebsd/freebsd_sched.c
diff -u src/sys/compat/freebsd/freebsd_sched.c:1.19 src/sys/compat/freebsd/freebsd_sched.c:1.20
--- src/sys/compat/freebsd/freebsd_sched.c:1.19 Mon Apr 28 16:23:41 2008
+++ src/sys/compat/freebsd/freebsd_sched.c Sat Jun 21 19:12:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_sched.c,v 1.19 2008/04/28 20:23:41 martin Exp $ */
+/* $NetBSD: freebsd_sched.c,v 1.20 2014/06/21 23:12:10 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: freebsd_sched.c,v 1.19 2008/04/28 20:23:41 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: freebsd_sched.c,v 1.20 2014/06/21 23:12:10 christos Exp $);
#include sys/param.h
#include sys/mount.h
@@ -62,12 +62,13 @@ freebsd_sys_yield(struct lwp *l, const v
*/
static int
sched_freebsd2native(int freebsd_policy,
-struct freebsd_sched_param *freebsd_params, int *native_policy,
+const struct freebsd_sched_param *freebsd_params, int *native_policy,
struct sched_param *native_params)
{
- int error;
+ int p;
- error = 0;
+ if (native_policy == NULL)
+ native_policy = p;
switch (freebsd_policy) {
case FREEBSD_SCHED_OTHER:
@@ -83,27 +84,26 @@ sched_freebsd2native(int freebsd_policy,
break;
default:
- error = EINVAL;
- break;
+ return EINVAL;
}
- if (freebsd_params != NULL native_params != NULL !error) {
- native_params = (struct sched_param *)freebsd_params;
+ if (freebsd_params != NULL native_params != NULL) {
+ /* XXX: Needs adjustment to do a proper conversion. */
+ native_params-sched_priority = freebsd_params-sched_priority;
}
-
- return (error);
+ return 0;
}
/*
- * XXX: Needs adjustment to do a proper conversion.
*/
static int
-sched_native2freebsd(int native_policy, struct sched_param *native_params,
+sched_native2freebsd(int native_policy, const struct sched_param *native_params,
int *freebsd_policy, struct freebsd_sched_param *freebsd_params)
{
- int error;
+ int p;
- error = 0;
+ if (freebsd_policy == NULL)
+ freebsd_policy = p;
switch (native_policy) {
case SCHED_OTHER:
@@ -119,15 +119,15 @@ sched_native2freebsd(int native_policy,
break;
default:
- error = EINVAL;
- break;
+ return EINVAL;
}
- if (native_params != NULL freebsd_params != NULL !error) {
- freebsd_params = (struct freebsd_sched_param *)native_params;
+ if (native_params != NULL freebsd_params != NULL) {
+ /* XXX: Needs adjustment to do a proper conversion. */
+ freebsd_params-sched_priority = native_params-sched_priority;
}
-
- return (error);
+
+ return 0;
}
int
@@ -199,7 +199,7 @@ freebsd_sys_sched_getparam(struct lwp *l
goto out;
out:
- return (error);
+ return error;
}
int
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: christos Date: Sat Jun 21 23:12:10 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_sched.c Log Message: Avoid NULL dereference and fix sched param conversion (at least make it do something). Pointed out by Maxime Villard To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/freebsd/freebsd_sched.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/freebsd
Module Name:src
Committed By: christos
Date: Fri Mar 7 02:02:16 UTC 2014
Modified Files:
src/sys/compat/freebsd: freebsd_mod.c
Log Message:
fix typos
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/freebsd/freebsd_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/freebsd/freebsd_mod.c
diff -u src/sys/compat/freebsd/freebsd_mod.c:1.4 src/sys/compat/freebsd/freebsd_mod.c:1.5
--- src/sys/compat/freebsd/freebsd_mod.c:1.4 Thu Mar 6 20:33:43 2014
+++ src/sys/compat/freebsd/freebsd_mod.c Thu Mar 6 21:02:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_mod.c,v 1.4 2014/03/07 01:33:43 christos Exp $ */
+/* $NetBSD: freebsd_mod.c,v 1.5 2014/03/07 02:02:16 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: freebsd_mod.c,v 1.4 2014/03/07 01:33:43 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: freebsd_mod.c,v 1.5 2014/03/07 02:02:16 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_execfmt.h
@@ -86,13 +86,13 @@ static struct execsw freebsd_execsw[] =
.es_hdrsz = FREEBSD_AOUT_HDR_SIZE,
.es_makecmds = exec_freebsd_aout_makecmds,
.u = {
- .elf_probe_function = NULL,
+ .elf_probe_func = NULL,
},
.es_emul = emul_freebsd,
.es_prio = EXECSW_PRIO_ANY,
.es_arglen = 0,
.es_copyargs = copyargs,
- .se_setregs = NULL,
+ .es_setregs = NULL,
.es_coredump = coredump_netbsd,
.es_setup_stack = exec_setup_stack,
},
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: christos Date: Fri Mar 7 02:02:16 UTC 2014 Modified Files: src/sys/compat/freebsd: freebsd_mod.c Log Message: fix typos To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/freebsd/freebsd_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/freebsd
Module Name:src Committed By: dsl Date: Sun Jan 19 13:36:40 UTC 2014 Removed Files: src/sys/compat/freebsd: freebsd_ptrace.h Log Message: No longer used. To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/sys/compat/freebsd/freebsd_ptrace.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/freebsd
Module Name:src Committed By: dsl Date: Sun Jan 19 13:36:40 UTC 2014 Removed Files: src/sys/compat/freebsd: freebsd_ptrace.h Log Message: No longer used. To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/sys/compat/freebsd/freebsd_ptrace.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/freebsd
Module Name:src Committed By: martin Date: Sun Aug 16 15:39:30 UTC 2009 Modified Files: src/sys/compat/freebsd: freebsd_exec_aout.c Log Message: Include sys/exec_aout.h for a.out specific defines. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/freebsd/freebsd_exec_aout.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_exec_aout.c diff -u src/sys/compat/freebsd/freebsd_exec_aout.c:1.8 src/sys/compat/freebsd/freebsd_exec_aout.c:1.9 --- src/sys/compat/freebsd/freebsd_exec_aout.c:1.8 Sat Dec 8 18:35:58 2007 +++ src/sys/compat/freebsd/freebsd_exec_aout.c Sun Aug 16 15:39:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_exec_aout.c,v 1.8 2007/12/08 18:35:58 dsl Exp $ */ +/* $NetBSD: freebsd_exec_aout.c,v 1.9 2009/08/16 15:39:30 martin Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -31,12 +31,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_exec_aout.c,v 1.8 2007/12/08 18:35:58 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_exec_aout.c,v 1.9 2009/08/16 15:39:30 martin Exp $); #include sys/param.h #include sys/systm.h #include sys/proc.h #include sys/exec.h +#include sys/exec_aout.h #ifndef EXEC_AOUT #define EXEC_AOUT /* to get a.out specific stuff */
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: martin Date: Sun Aug 16 15:41:51 UTC 2009 Modified Files: src/sys/compat/freebsd: freebsd_mod.c Log Message: Add missing include sys/exec_aout.h To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/freebsd/freebsd_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/freebsd/freebsd_mod.c diff -u src/sys/compat/freebsd/freebsd_mod.c:1.1 src/sys/compat/freebsd/freebsd_mod.c:1.2 --- src/sys/compat/freebsd/freebsd_mod.c:1.1 Wed Nov 19 18:36:02 2008 +++ src/sys/compat/freebsd/freebsd_mod.c Sun Aug 16 15:41:51 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_mod.c,v 1.1 2008/11/19 18:36:02 ad Exp $ */ +/* $NetBSD: freebsd_mod.c,v 1.2 2009/08/16 15:41:51 martin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: freebsd_mod.c,v 1.1 2008/11/19 18:36:02 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: freebsd_mod.c,v 1.2 2009/08/16 15:41:51 martin Exp $); #ifdef _KERNEL_OPT #include opt_execfmt.h @@ -40,6 +40,7 @@ #include sys/module.h #include sys/exec.h #include sys/exec_elf.h +#include sys/exec_aout.h #include sys/signalvar.h #include compat/freebsd/freebsd_exec.h
