svn commit: r335178 - in head/sys: compat/freebsd32 i386/ibcs2 kern sys
Brooks Davis
brooks at FreeBSD.org
Thu Jun 14 21:29:34 UTC 2018
Author: brooks
Date: Thu Jun 14 21:29:31 2018
New Revision: 335178
URL: https://svnweb.freebsd.org/changeset/base/335178
Log:
Regen after 335177 (rename sys_obreak to sys_break).
Modified:
head/sys/compat/freebsd32/freebsd32_sysent.c
head/sys/compat/freebsd32/freebsd32_systrace_args.c
head/sys/i386/ibcs2/ibcs2_proto.h
head/sys/i386/ibcs2/ibcs2_syscall.h
head/sys/i386/ibcs2/ibcs2_sysent.c
head/sys/kern/init_sysent.c
head/sys/kern/systrace_args.c
head/sys/sys/sysproto.h
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Thu Jun 14 21:29:31 2018 (r335178)
@@ -73,7 +73,7 @@ struct sysent freebsd32_sysent[] = {
{ compat11(AS(freebsd11_freebsd32_mknod_args),freebsd32_mknod), AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = freebsd11 freebsd32_mknod */
{ AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 15 = chmod */
{ AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 16 = chown */
- { AS(obreak_args), (sy_call_t *)sys_obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 17 = break */
+ { AS(break_args), (sy_call_t *)sys_break, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 17 = break */
{ compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 18 = freebsd4 freebsd32_getfsstat */
{ compat(AS(ofreebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 19 = old freebsd32_lseek */
{ 0, (sy_call_t *)sys_getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 20 = getpid */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Thu Jun 14 21:29:31 2018 (r335178)
@@ -121,9 +121,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 3;
break;
}
- /* obreak */
+ /* break */
case 17: {
- struct obreak_args *p = params;
+ struct break_args *p = params;
uarg[0] = (intptr_t) p->nsize; /* char * */
*n_args = 1;
break;
@@ -3454,7 +3454,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* obreak */
+ /* break */
case 17:
switch(ndx) {
case 0:
@@ -8886,7 +8886,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* obreak */
+ /* break */
case 17:
if (ndx == 0 || ndx == 1)
p = "caddr_t";
Modified: head/sys/i386/ibcs2/ibcs2_proto.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_proto.h Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/i386/ibcs2/ibcs2_proto.h Thu Jun 14 21:29:31 2018 (r335178)
@@ -11,6 +11,7 @@
#include <sys/signal.h>
#include <sys/acl.h>
#include <sys/cpuset.h>
+#include <sys/domainset.h>
#include <sys/_ffcounter.h>
#include <sys/_semaphore.h>
#include <sys/ucontext.h>
@@ -357,6 +358,12 @@ int ibcs2_isc(struct thread *, struct ibcs2_isc_args *
#endif /* COMPAT_FREEBSD10 */
+
+
+#ifdef COMPAT_FREEBSD11
+
+
+#endif /* COMPAT_FREEBSD11 */
#define IBCS2_SYS_AUE_ibcs2_read AUE_NULL
#define IBCS2_SYS_AUE_ibcs2_open AUE_OPEN_RWTC
Modified: head/sys/i386/ibcs2/ibcs2_syscall.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_syscall.h Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/i386/ibcs2/ibcs2_syscall.h Thu Jun 14 21:29:31 2018 (r335178)
@@ -22,7 +22,7 @@
#define IBCS2_SYS_ibcs2_mknod 14
#define IBCS2_SYS_ibcs2_chmod 15
#define IBCS2_SYS_ibcs2_chown 16
-#define IBCS2_SYS_obreak 17
+#define IBCS2_SYS_break 17
#define IBCS2_SYS_ibcs2_stat 18
#define IBCS2_SYS_ibcs2_lseek 19
#define IBCS2_SYS_getpid 20
Modified: head/sys/i386/ibcs2/ibcs2_sysent.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_sysent.c Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/i386/ibcs2/ibcs2_sysent.c Thu Jun 14 21:29:31 2018 (r335178)
@@ -33,7 +33,7 @@ struct sysent ibcs2_sysent[] = {
{ AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = ibcs2_mknod */
{ AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 15 = ibcs2_chmod */
{ AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 16 = ibcs2_chown */
- { AS(obreak_args), (sy_call_t *)sys_obreak, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 17 = obreak */
+ { AS(break_args), (sy_call_t *)sys_break, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 17 = break */
{ AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 18 = ibcs2_stat */
{ AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_LSEEK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 19 = ibcs2_lseek */
{ 0, (sy_call_t *)sys_getpid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 20 = getpid */
Modified: head/sys/kern/init_sysent.c
==============================================================================
--- head/sys/kern/init_sysent.c Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/kern/init_sysent.c Thu Jun 14 21:29:31 2018 (r335178)
@@ -66,7 +66,7 @@ struct sysent sysent[] = {
{ compat11(AS(freebsd11_mknod_args),mknod), AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = freebsd11 mknod */
{ AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 15 = chmod */
{ AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 16 = chown */
- { AS(obreak_args), (sy_call_t *)sys_obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 17 = break */
+ { AS(break_args), (sy_call_t *)sys_break, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 17 = break */
{ compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 18 = freebsd4 getfsstat */
{ compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 19 = old lseek */
{ 0, (sy_call_t *)sys_getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 20 = getpid */
Modified: head/sys/kern/systrace_args.c
==============================================================================
--- head/sys/kern/systrace_args.c Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/kern/systrace_args.c Thu Jun 14 21:29:31 2018 (r335178)
@@ -118,9 +118,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 3;
break;
}
- /* obreak */
+ /* break */
case 17: {
- struct obreak_args *p = params;
+ struct break_args *p = params;
uarg[0] = (intptr_t) p->nsize; /* char * */
*n_args = 1;
break;
@@ -3459,7 +3459,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* obreak */
+ /* break */
case 17:
switch(ndx) {
case 0:
@@ -8835,7 +8835,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* obreak */
+ /* break */
case 17:
if (ndx == 0 || ndx == 1)
p = "caddr_t";
Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h Thu Jun 14 21:27:25 2018 (r335177)
+++ head/sys/sys/sysproto.h Thu Jun 14 21:29:31 2018 (r335178)
@@ -89,7 +89,7 @@ struct chown_args {
char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)];
char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)];
};
-struct obreak_args {
+struct break_args {
char nsize_l_[PADL_(char *)]; char * nsize; char nsize_r_[PADR_(char *)];
};
struct getpid_args {
@@ -1784,7 +1784,7 @@ int sys_chdir(struct thread *, struct chdir_args *);
int sys_fchdir(struct thread *, struct fchdir_args *);
int sys_chmod(struct thread *, struct chmod_args *);
int sys_chown(struct thread *, struct chown_args *);
-int sys_obreak(struct thread *, struct obreak_args *);
+int sys_break(struct thread *, struct break_args *);
int sys_getpid(struct thread *, struct getpid_args *);
int sys_mount(struct thread *, struct mount_args *);
int sys_unmount(struct thread *, struct unmount_args *);
More information about the svn-src-head
mailing list