Author: brooks
Date: Fri Nov 9 00:46:50 2018
New Revision: 340275
URL: https://svnweb.freebsd.org/changeset/base/340275
Log:
Regen after r340274: Make freebsd32_utmx_op follow the freebsd32_foo
convention.
Modified:
head/sys/compat/freebsd32/freebsd32_proto.h
head/sys/compat/freebsd32/freebsd32_syscall.h
head/sys/compat/freebsd32/freebsd32_syscalls.c
head/sys/compat/freebsd32/freebsd32_sysent.c
head/sys/compat/freebsd32/freebsd32_systrace_args.c
Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 00:46:10 2018
(r340274)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 00:46:50 2018
(r340275)
@@ -350,7 +350,7 @@ struct freebsd32_ksem_timedwait_args {
struct freebsd32_thr_suspend_args {
char timeout_l_[PADL_(const struct timespec32 *)]; const struct
timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)];
};
-struct freebsd32_umtx_op_args {
+struct freebsd32__umtx_op_args {
char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)];
char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
char val_l_[PADL_(u_long)]; u_long val; char val_r_[PADR_(u_long)];
@@ -776,7 +776,7 @@ int freebsd32_setcontext(struct thread *, struct freeb
int freebsd32_swapcontext(struct thread *, struct
freebsd32_swapcontext_args *);
int freebsd32_ksem_timedwait(struct thread *, struct
freebsd32_ksem_timedwait_args *);
int freebsd32_thr_suspend(struct thread *, struct
freebsd32_thr_suspend_args *);
-int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *);
+int freebsd32__umtx_op(struct thread *, struct freebsd32__umtx_op_args *);
int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *);
int freebsd32_sigqueue(struct thread *, struct freebsd32_sigqueue_args *);
int freebsd32_kmq_open(struct thread *, struct freebsd32_kmq_open_args *);
@@ -1335,7 +1335,7 @@ int freebsd11_freebsd32_mknodat(struct thread *,
struc
#define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_ksem_timedwait AUE_SEMWAIT
#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL
-#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32__umtx_op AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_THR_NEW
#define FREEBSD32_SYS_AUE_freebsd32_sigqueue AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kmq_open AUE_MQ_OPEN
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 00:46:10
2018 (r340274)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 00:46:50
2018 (r340275)
@@ -374,7 +374,7 @@
#define FREEBSD32_SYS_getaudit_addr 451
#define FREEBSD32_SYS_setaudit_addr 452
#define FREEBSD32_SYS_auditctl 453
-#define FREEBSD32_SYS_freebsd32_umtx_op 454
+#define FREEBSD32_SYS_freebsd32__umtx_op 454
#define FREEBSD32_SYS_freebsd32_thr_new 455
#define FREEBSD32_SYS_freebsd32_sigqueue 456
#define FREEBSD32_SYS_freebsd32_kmq_open 457
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 00:46:10
2018 (r340274)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 00:46:50
2018 (r340275)
@@ -463,7 +463,7 @@ const char *freebsd32_syscallnames[] = {
"getaudit_addr", /* 451 = getaudit_addr */
"setaudit_addr", /* 452 = setaudit_addr */
"auditctl", /* 453 = auditctl */
- "freebsd32_umtx_op", /* 454 = freebsd32_umtx_op */
+ "freebsd32__umtx_op", /* 454 = freebsd32__umtx_op */
"freebsd32_thr_new", /* 455 = freebsd32_thr_new */
"freebsd32_sigqueue", /* 456 = freebsd32_sigqueue */
"freebsd32_kmq_open", /* 457 = freebsd32_kmq_open */
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 00:46:10
2018 (r340274)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 00:46:50
2018 (r340275)
@@ -510,7 +510,7 @@ struct sysent freebsd32_sysent[] = {
{ AS(getaudit_addr_args), (sy_call_t *)sys_getaudit_addr,
AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 451 =
getaudit_addr */
{ AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr,
AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 452 =
setaudit_addr */
{ AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0,
0, 0, SY_THR_STATIC }, /* 453 = auditctl */
- { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 454 = freebsd32_umtx_op */
+ { AS(freebsd32__umtx_op_args), (sy_call_t *)freebsd32__umtx_op,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 454 = freebsd32__umtx_op */
{ AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new,
AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 455 =
freebsd32_thr_new */
{ AS(freebsd32_sigqueue_args), (sy_call_t *)freebsd32_sigqueue,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 456 = freebsd32_sigqueue */
{ AS(freebsd32_kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL,
0, 0, 0, SY_THR_ABSENT }, /* 457 = freebsd32_kmq_open */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 00:46:10
2018 (r340274)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 00:46:50
2018 (r340275)
@@ -2182,9 +2182,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 1;
break;
}
- /* freebsd32_umtx_op */
+ /* freebsd32__umtx_op */
case 454: {
- struct freebsd32_umtx_op_args *p = params;
+ struct freebsd32__umtx_op_args *p = params;
uarg[0] = (intptr_t) p->obj; /* void * */
iarg[1] = p->op; /* int */
uarg[2] = p->val; /* u_long */
@@ -6765,7 +6765,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* freebsd32_umtx_op */
+ /* freebsd32__umtx_op */
case 454:
switch(ndx) {
case 0:
@@ -10040,7 +10040,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* freebsd32_umtx_op */
+ /* freebsd32__umtx_op */
case 454:
if (ndx == 0 || ndx == 1)
p = "int";
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
