The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0ebea13928f3170fe95eb5715522aaf43b45fc47
commit 0ebea13928f3170fe95eb5715522aaf43b45fc47
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-17 20:12:24 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-17 20:12:24 +0000
freebsd32: include `__` in semctl names
This mirrors sys/kern/syscall.master and will simplify generation
of freebsd32 files.
Reviewed by: kevans
---
sys/compat/freebsd32/freebsd32_proto.h | 12 ++++++------
sys/compat/freebsd32/freebsd32_syscall.h | 4 ++--
sys/compat/freebsd32/freebsd32_syscalls.c | 4 ++--
sys/compat/freebsd32/freebsd32_sysent.c | 4 ++--
sys/compat/freebsd32/freebsd32_systrace_args.c | 8 ++++----
sys/compat/freebsd32/syscalls.master | 4 ++--
sys/kern/sysv_sem.c | 14 +++++++-------
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index a66253b589ca..1d538f9dcac8 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -554,7 +554,7 @@ struct freebsd32_jail_set_args {
char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char
iovcnt_r_[PADR_(unsigned int)];
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
-struct freebsd32_semctl_args {
+struct freebsd32___semctl_args {
char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
@@ -862,7 +862,7 @@ int freebsd32_fexecve(struct thread *, struct
freebsd32_fexecve_args *);
int freebsd32_futimesat(struct thread *, struct freebsd32_futimesat_args *);
int freebsd32_jail_get(struct thread *, struct freebsd32_jail_get_args *);
int freebsd32_jail_set(struct thread *, struct freebsd32_jail_set_args *);
-int freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *);
+int freebsd32___semctl(struct thread *, struct freebsd32___semctl_args *);
int freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
int freebsd32_pselect(struct thread *, struct freebsd32_pselect_args *);
@@ -1167,7 +1167,7 @@ int freebsd6_freebsd32_lio_listio(struct thread *,
struct freebsd6_freebsd32_lio
#if !defined(PAD64_REQUIRED) && !defined(__amd64__)
#define PAD64_REQUIRED
#endif
-struct freebsd7_freebsd32_semctl_args {
+struct freebsd7_freebsd32___semctl_args {
char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
@@ -1198,7 +1198,7 @@ struct freebsd7_freebsd32_shmctl_args {
#ifdef PAD64_REQUIRED
#else
#endif
-int freebsd7_freebsd32_semctl(struct thread *, struct
freebsd7_freebsd32_semctl_args *);
+int freebsd7_freebsd32___semctl(struct thread *, struct
freebsd7_freebsd32___semctl_args *);
int freebsd7_freebsd32_msgctl(struct thread *, struct
freebsd7_freebsd32_msgctl_args *);
int freebsd7_freebsd32_shmctl(struct thread *, struct
freebsd7_freebsd32_shmctl_args *);
@@ -1391,7 +1391,7 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_ftruncate AUE_FTRUNCATE
#define FREEBSD32_SYS_AUE_freebsd32___sysctl AUE_SYSCTL
#define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES
-#define FREEBSD32_SYS_AUE_freebsd7_freebsd32_semctl AUE_SEMCTL
+#define FREEBSD32_SYS_AUE_freebsd7_freebsd32___semctl AUE_SEMCTL
#define FREEBSD32_SYS_AUE_freebsd7_freebsd32_msgctl AUE_MSGCTL
#define FREEBSD32_SYS_AUE_freebsd32_msgsnd AUE_MSGSND
#define FREEBSD32_SYS_AUE_freebsd32_msgrcv AUE_MSGRCV
@@ -1475,7 +1475,7 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT
#define FREEBSD32_SYS_AUE_freebsd32_jail_get AUE_JAIL_GET
#define FREEBSD32_SYS_AUE_freebsd32_jail_set AUE_JAIL_SET
-#define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL
+#define FREEBSD32_SYS_AUE_freebsd32___semctl AUE_SEMCTL
#define FREEBSD32_SYS_AUE_freebsd32_msgctl AUE_MSGCTL
#define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL
#define FREEBSD32_SYS_AUE_freebsd32_pselect AUE_SELECT
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index 321a72fb744a..83c5d1f9d3a4 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -195,7 +195,7 @@
#define FREEBSD32_SYS_freebsd32_futimes 206
#define FREEBSD32_SYS_getpgid 207
#define FREEBSD32_SYS_poll 209
-#define FREEBSD32_SYS_freebsd7_freebsd32_semctl 220
+#define FREEBSD32_SYS_freebsd7_freebsd32___semctl 220
#define FREEBSD32_SYS_semget 221
#define FREEBSD32_SYS_semop 222
/* 223 is obsolete semconfig */
@@ -435,7 +435,7 @@
#define FREEBSD32_SYS_freebsd32_jail_set 507
#define FREEBSD32_SYS_jail_remove 508
#define FREEBSD32_SYS_freebsd12_closefrom 509
-#define FREEBSD32_SYS_freebsd32_semctl 510
+#define FREEBSD32_SYS_freebsd32___semctl 510
#define FREEBSD32_SYS_freebsd32_msgctl 511
#define FREEBSD32_SYS_freebsd32_shmctl 512
#define FREEBSD32_SYS_lpathconf 513
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index e7da47e3d7fe..9d9600b2b2e9 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -229,7 +229,7 @@ const char *freebsd32_syscallnames[] = {
"lkmnosys", /* 217 = lkmnosys */
"lkmnosys", /* 218 = lkmnosys */
"lkmnosys", /* 219 = lkmnosys */
- "compat7.freebsd32_semctl", /* 220 = freebsd7
freebsd32_semctl */
+ "compat7.freebsd32___semctl", /* 220 = freebsd7
freebsd32___semctl */
"semget", /* 221 = semget */
"semop", /* 222 = semop */
"obs_semconfig", /* 223 = obsolete semconfig */
@@ -532,7 +532,7 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_jail_set", /* 507 = freebsd32_jail_set */
"jail_remove", /* 508 = jail_remove */
"compat12.closefrom", /* 509 = freebsd12 closefrom */
- "freebsd32_semctl", /* 510 = freebsd32_semctl */
+ "freebsd32___semctl", /* 510 = freebsd32___semctl */
"freebsd32_msgctl", /* 511 = freebsd32_msgctl */
"freebsd32_shmctl", /* 512 = freebsd32_shmctl */
"lpathconf", /* 513 = lpathconf */
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index ebf1c02e3a8a..26bd67a88d74 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -282,7 +282,7 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(nosys_args), .sy_call = (sy_call_t *)lkmnosys,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 217
= lkmnosys */
{ .sy_narg = AS(nosys_args), .sy_call = (sy_call_t *)lkmnosys,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 218
= lkmnosys */
{ .sy_narg = AS(nosys_args), .sy_call = (sy_call_t *)lkmnosys,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 219
= lkmnosys */
- { .sy_narg = 0, .sy_call = (sy_call_t *)lkmressys, .sy_auevent =
AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 220 =
freebsd7 freebsd32_semctl */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)lkmressys, .sy_auevent =
AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 220 =
freebsd7 freebsd32___semctl */
{ .sy_narg = AS(semget_args), .sy_call = (sy_call_t *)lkmressys,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 221 =
semget */
{ .sy_narg = AS(semop_args), .sy_call = (sy_call_t *)lkmressys,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 222
= semop */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 223 =
obsolete semconfig */
@@ -585,7 +585,7 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(freebsd32_jail_set_args), .sy_call = (sy_call_t
*)freebsd32_jail_set, .sy_auevent = AUE_JAIL_SET, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 507 = freebsd32_jail_set */
{ .sy_narg = AS(jail_remove_args), .sy_call = (sy_call_t
*)sys_jail_remove, .sy_auevent = AUE_JAIL_REMOVE, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 508 = jail_remove */
{ compat12(AS(freebsd12_closefrom_args),closefrom), .sy_auevent =
AUE_CLOSEFROM, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },
/* 509 = freebsd12 closefrom */
- { .sy_narg = AS(freebsd32_semctl_args), .sy_call = (sy_call_t
*)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT
}, /* 510 = freebsd32_semctl */
+ { .sy_narg = AS(freebsd32___semctl_args), .sy_call = (sy_call_t
*)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT
}, /* 510 = freebsd32___semctl */
{ .sy_narg = AS(freebsd32_msgctl_args), .sy_call = (sy_call_t
*)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT
}, /* 511 = freebsd32_msgctl */
{ .sy_narg = AS(freebsd32_shmctl_args), .sy_call = (sy_call_t
*)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT
}, /* 512 = freebsd32_shmctl */
{ .sy_narg = AS(lpathconf_args), .sy_call = (sy_call_t *)sys_lpathconf,
.sy_auevent = AUE_LPATHCONF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },
/* 513 = lpathconf */
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index abeaaeb23534..3a5bd3b9a9a8 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -2729,9 +2729,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 1;
break;
}
- /* freebsd32_semctl */
+ /* freebsd32___semctl */
case 510: {
- struct freebsd32_semctl_args *p = params;
+ struct freebsd32___semctl_args *p = params;
iarg[0] = p->semid; /* int */
iarg[1] = p->semnum; /* int */
iarg[2] = p->cmd; /* int */
@@ -7961,7 +7961,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
- /* freebsd32_semctl */
+ /* freebsd32___semctl */
case 510:
switch (ndx) {
case 0:
@@ -10804,7 +10804,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* freebsd32_semctl */
+ /* freebsd32___semctl */
case 510:
if (ndx == 0 || ndx == 1)
p = "int";
diff --git a/sys/compat/freebsd32/syscalls.master
b/sys/compat/freebsd32/syscalls.master
index 22e7a376d2be..c72fb54df0a1 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -418,7 +418,7 @@
218 AUE_NULL NODEF|NOTSTATIC lkmnosys lkmnosys nosys_args int
219 AUE_NULL NODEF|NOTSTATIC lkmnosys lkmnosys nosys_args int
-220 AUE_SEMCTL COMPAT7|NOSTD { int freebsd32_semctl( \
+220 AUE_SEMCTL COMPAT7|NOSTD { int freebsd32___semctl( \
int semid, int semnum, \
int cmd, union semun_old32 *arg); }
221 AUE_SEMGET NOSTD|NOPROTO { int semget(key_t key, int nsems, \
@@ -984,7 +984,7 @@
unsigned int iovcnt, int flags); }
508 AUE_JAIL_REMOVE NOPROTO { int jail_remove(int jid); }
509 AUE_CLOSEFROM COMPAT12|NOPROTO { int closefrom(int lowfd); }
-510 AUE_SEMCTL NOSTD { int freebsd32_semctl(int semid, int semnum, \
+510 AUE_SEMCTL NOSTD { int freebsd32___semctl(int semid, int semnum, \
int cmd, union semun32 *arg); }
511 AUE_MSGCTL NOSTD { int freebsd32_msgctl(int msqid, int cmd, \
struct msqid_ds32 *buf); }
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 5c8b2b069d35..b55ef00c9c70 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -254,13 +254,13 @@ static struct syscall_helper_data sem_syscalls[] = {
#include <compat/freebsd32/freebsd32_util.h>
static struct syscall_helper_data sem32_syscalls[] = {
- SYSCALL32_INIT_HELPER(freebsd32_semctl),
+ SYSCALL32_INIT_HELPER(freebsd32___semctl),
SYSCALL32_INIT_HELPER_COMPAT(semget),
SYSCALL32_INIT_HELPER_COMPAT(semop),
SYSCALL32_INIT_HELPER(freebsd32_semsys),
#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
- SYSCALL32_INIT_HELPER(freebsd7_freebsd32_semctl),
+ SYSCALL32_INIT_HELPER(freebsd7_freebsd32___semctl),
#endif
SYSCALL_INIT_LAST
};
@@ -1851,8 +1851,8 @@ freebsd32_semsys(struct thread *td, struct
freebsd32_semsys_args *uap)
AUDIT_ARG_SVIPC_WHICH(uap->which);
switch (uap->which) {
case 0:
- return (freebsd7_freebsd32_semctl(td,
- (struct freebsd7_freebsd32_semctl_args *)&uap->a2));
+ return (freebsd7_freebsd32___semctl(td,
+ (struct freebsd7_freebsd32___semctl_args *)&uap->a2));
default:
return (sys_semsys(td, (struct semsys_args *)uap));
}
@@ -1864,8 +1864,8 @@ freebsd32_semsys(struct thread *td, struct
freebsd32_semsys_args *uap)
#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
int
-freebsd7_freebsd32_semctl(struct thread *td,
- struct freebsd7_freebsd32_semctl_args *uap)
+freebsd7_freebsd32___semctl(struct thread *td,
+ struct freebsd7_freebsd32___semctl_args *uap)
{
struct semid_ds_old32 dsbuf32;
struct semid_ds dsbuf;
@@ -1937,7 +1937,7 @@ freebsd7_freebsd32_semctl(struct thread *td,
#endif
int
-freebsd32_semctl(struct thread *td, struct freebsd32_semctl_args *uap)
+freebsd32___semctl(struct thread *td, struct freebsd32___semctl_args *uap)
{
struct semid_ds32 dsbuf32;
struct semid_ds dsbuf;
