svn commit: r341475 - in head/sys: kern sys
Brooks Davis
brooks at FreeBSD.org
Tue Dec 4 16:49:15 UTC 2018
Author: brooks
Date: Tue Dec 4 16:49:14 2018
New Revision: 341475
URL: https://svnweb.freebsd.org/changeset/base/341475
Log:
Regen after r341474: Normalize COMPAT_43 syscall declarations.
Modified:
head/sys/kern/init_sysent.c
head/sys/sys/sysproto.h
Modified: head/sys/kern/init_sysent.c
==============================================================================
--- head/sys/kern/init_sysent.c Tue Dec 4 16:48:47 2018 (r341474)
+++ head/sys/kern/init_sysent.c Tue Dec 4 16:49:14 2018 (r341475)
@@ -112,7 +112,7 @@ struct sysent sysent[] = {
{ AS(umask_args), (sy_call_t *)sys_umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 60 = umask */
{ AS(chroot_args), (sy_call_t *)sys_chroot, AUE_CHROOT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 61 = chroot */
{ compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 62 = old fstat */
- { compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 63 = old getkerninfo */
+ { compat(AS(ogetkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 63 = old getkerninfo */
{ compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 64 = old getpagesize */
{ AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 65 = msync */
{ 0, (sy_call_t *)sys_vfork, AUE_VFORK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 66 = vfork */
@@ -136,8 +136,8 @@ struct sysent sysent[] = {
{ compat(0,wait), AUE_WAIT4, NULL, 0, 0, 0, SY_THR_STATIC }, /* 84 = old wait */
{ AS(swapon_args), (sy_call_t *)sys_swapon, AUE_SWAPON, NULL, 0, 0, 0, SY_THR_STATIC }, /* 85 = swapon */
{ AS(getitimer_args), (sy_call_t *)sys_getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 86 = getitimer */
- { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 87 = old gethostname */
- { compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 88 = old sethostname */
+ { compat(AS(ogethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 87 = old gethostname */
+ { compat(AS(osethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 88 = old sethostname */
{ 0, (sy_call_t *)sys_getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 89 = getdtablesize */
{ AS(dup2_args), (sy_call_t *)sys_dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 90 = dup2 */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 91 = getdopt */
@@ -148,7 +148,7 @@ struct sysent sysent[] = {
{ AS(setpriority_args), (sy_call_t *)sys_setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 96 = setpriority */
{ AS(socket_args), (sy_call_t *)sys_socket, AUE_SOCKET, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 97 = socket */
{ AS(connect_args), (sy_call_t *)sys_connect, AUE_CONNECT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 98 = connect */
- { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 99 = old accept */
+ { compat(AS(oaccept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 99 = old accept */
{ AS(getpriority_args), (sy_call_t *)sys_getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 100 = getpriority */
{ compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 101 = old send */
{ compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 102 = old recv */
Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h Tue Dec 4 16:48:47 2018 (r341474)
+++ head/sys/sys/sysproto.h Tue Dec 4 16:49:14 2018 (r341475)
@@ -247,7 +247,7 @@ struct umask_args {
struct chroot_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
};
-struct getpagesize_args {
+struct ogetpagesize_args {
register_t dummy;
};
struct msync_args {
@@ -2183,7 +2183,7 @@ struct ofstat_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char sb_l_[PADL_(struct ostat *)]; struct ostat * sb; char sb_r_[PADR_(struct ostat *)];
};
-struct getkerninfo_args {
+struct ogetkerninfo_args {
char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
char where_l_[PADL_(char *)]; char * where; char where_r_[PADR_(char *)];
char size_l_[PADL_(size_t *)]; size_t * size; char size_r_[PADR_(size_t *)];
@@ -2197,11 +2197,11 @@ struct ommap_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char pos_l_[PADL_(long)]; long pos; char pos_r_[PADR_(long)];
};
-struct gethostname_args {
+struct ogethostname_args {
char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
};
-struct sethostname_args {
+struct osethostname_args {
char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
};
@@ -2290,13 +2290,13 @@ int osigaction(struct thread *, struct osigaction_args
int osigprocmask(struct thread *, struct osigprocmask_args *);
int osigpending(struct thread *, struct osigpending_args *);
int ofstat(struct thread *, struct ofstat_args *);
-int ogetkerninfo(struct thread *, struct getkerninfo_args *);
-int ogetpagesize(struct thread *, struct getpagesize_args *);
+int ogetkerninfo(struct thread *, struct ogetkerninfo_args *);
+int ogetpagesize(struct thread *, struct ogetpagesize_args *);
int ommap(struct thread *, struct ommap_args *);
int owait(struct thread *, struct owait_args *);
-int ogethostname(struct thread *, struct gethostname_args *);
-int osethostname(struct thread *, struct sethostname_args *);
-int oaccept(struct thread *, struct accept_args *);
+int ogethostname(struct thread *, struct ogethostname_args *);
+int osethostname(struct thread *, struct osethostname_args *);
+int oaccept(struct thread *, struct oaccept_args *);
int osend(struct thread *, struct osend_args *);
int orecv(struct thread *, struct orecv_args *);
int osigreturn(struct thread *, struct osigreturn_args *);
More information about the svn-src-head
mailing list