aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/freebsd32/freebsd32_sysent.c4
-rw-r--r--sys/compat/freebsd32/freebsd32_systrace_args.c4
-rw-r--r--sys/kern/init_sysent.c4
-rw-r--r--sys/kern/systrace_args.c4
-rw-r--r--sys/sys/sysproto.h8
5 files changed, 12 insertions, 12 deletions
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index 52e54fcbf60b..7bb6579ea864 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -250,8 +250,8 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(pathconf_args), .sy_call = (sy_call_t *)sys_pathconf, .sy_auevent = AUE_PATHCONF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 191 = pathconf */
{ .sy_narg = AS(fpathconf_args), .sy_call = (sy_call_t *)sys_fpathconf, .sy_auevent = AUE_FPATHCONF, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 192 = fpathconf */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 193 = reserved for local use */
- { .sy_narg = AS(__getrlimit_args), .sy_call = (sy_call_t *)sys_getrlimit, .sy_auevent = AUE_GETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 194 = getrlimit */
- { .sy_narg = AS(__setrlimit_args), .sy_call = (sy_call_t *)sys_setrlimit, .sy_auevent = AUE_SETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 195 = setrlimit */
+ { .sy_narg = AS(getrlimit_args), .sy_call = (sy_call_t *)sys_getrlimit, .sy_auevent = AUE_GETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 194 = getrlimit */
+ { .sy_narg = AS(setrlimit_args), .sy_call = (sy_call_t *)sys_setrlimit, .sy_auevent = AUE_SETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 195 = setrlimit */
{ compat11(AS(freebsd11_freebsd32_getdirentries_args),freebsd32_getdirentries), .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 196 = freebsd11 freebsd32_getdirentries */
{ compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), .sy_auevent = AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 197 = freebsd6 freebsd32_mmap */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 198 = __syscall */
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index e4dad59ea7dd..a76d37727abb 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -924,7 +924,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* getrlimit */
case 194: {
- struct __getrlimit_args *p = params;
+ struct getrlimit_args *p = params;
uarg[a++] = p->which; /* u_int */
uarg[a++] = (intptr_t)p->rlp; /* struct rlimit * */
*n_args = 2;
@@ -932,7 +932,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* setrlimit */
case 195: {
- struct __setrlimit_args *p = params;
+ struct setrlimit_args *p = params;
uarg[a++] = p->which; /* u_int */
uarg[a++] = (intptr_t)p->rlp; /* struct rlimit * */
*n_args = 2;
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index af2ffc744534..0ee450c5d32f 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -249,8 +249,8 @@ struct sysent sysent[] = {
{ .sy_narg = AS(pathconf_args), .sy_call = (sy_call_t *)sys_pathconf, .sy_auevent = AUE_PATHCONF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 191 = pathconf */
{ .sy_narg = AS(fpathconf_args), .sy_call = (sy_call_t *)sys_fpathconf, .sy_auevent = AUE_FPATHCONF, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 192 = fpathconf */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 193 = reserved for local use */
- { .sy_narg = AS(__getrlimit_args), .sy_call = (sy_call_t *)sys_getrlimit, .sy_auevent = AUE_GETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 194 = getrlimit */
- { .sy_narg = AS(__setrlimit_args), .sy_call = (sy_call_t *)sys_setrlimit, .sy_auevent = AUE_SETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 195 = setrlimit */
+ { .sy_narg = AS(getrlimit_args), .sy_call = (sy_call_t *)sys_getrlimit, .sy_auevent = AUE_GETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 194 = getrlimit */
+ { .sy_narg = AS(setrlimit_args), .sy_call = (sy_call_t *)sys_setrlimit, .sy_auevent = AUE_SETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 195 = setrlimit */
{ compat11(AS(freebsd11_getdirentries_args),getdirentries), .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 196 = freebsd11 getdirentries */
{ compat6(AS(freebsd6_mmap_args),mmap), .sy_auevent = AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 197 = freebsd6 mmap */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 198 = __syscall */
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 0965d0d5ac5a..8e9e42de5e86 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -947,7 +947,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* getrlimit */
case 194: {
- struct __getrlimit_args *p = params;
+ struct getrlimit_args *p = params;
uarg[a++] = p->which; /* u_int */
uarg[a++] = (intptr_t)p->rlp; /* struct rlimit * */
*n_args = 2;
@@ -955,7 +955,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* setrlimit */
case 195: {
- struct __setrlimit_args *p = params;
+ struct setrlimit_args *p = params;
uarg[a++] = p->which; /* u_int */
uarg[a++] = (intptr_t)p->rlp; /* struct rlimit * */
*n_args = 2;
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 71ef869ce224..cd8163101a12 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -547,11 +547,11 @@ struct fpathconf_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)];
};
-struct __getrlimit_args {
+struct getrlimit_args {
char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)];
};
-struct __setrlimit_args {
+struct setrlimit_args {
char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)];
};
@@ -1973,8 +1973,8 @@ int sys_setegid(struct thread *, struct setegid_args *);
int sys_seteuid(struct thread *, struct seteuid_args *);
int sys_pathconf(struct thread *, struct pathconf_args *);
int sys_fpathconf(struct thread *, struct fpathconf_args *);
-int sys_getrlimit(struct thread *, struct __getrlimit_args *);
-int sys_setrlimit(struct thread *, struct __setrlimit_args *);
+int sys_getrlimit(struct thread *, struct getrlimit_args *);
+int sys_setrlimit(struct thread *, struct setrlimit_args *);
int sys___sysctl(struct thread *, struct __sysctl_args *);
int sys_mlock(struct thread *, struct mlock_args *);
int sys_munlock(struct thread *, struct munlock_args *);