git: cd875998dc23 - main - linux(4): Regen for semop syscall.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 17:03:36 UTC
The branch main has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=cd875998dc236eb531753bba7296a834de57d99d
commit cd875998dc236eb531753bba7296a834de57d99d
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2022-05-06 16:59:33 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-05-06 16:59:33 +0000
linux(4): Regen for semop syscall.
MFC after: 2 weeks
---
sys/amd64/linux/linux_proto.h | 7 -------
sys/amd64/linux/linux_syscall.h | 2 +-
sys/amd64/linux/linux_syscalls.c | 2 +-
sys/amd64/linux/linux_sysent.c | 2 +-
sys/amd64/linux/linux_systrace_args.c | 16 ++++++++--------
sys/arm64/linux/linux_proto.h | 7 -------
sys/arm64/linux/linux_syscall.h | 2 +-
sys/arm64/linux/linux_syscalls.c | 2 +-
sys/arm64/linux/linux_sysent.c | 2 +-
sys/arm64/linux/linux_systrace_args.c | 16 ++++++++--------
10 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index 85f066411f0e..bbb63b037203 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -312,11 +312,6 @@ struct linux_semget_args {
char nsems_l_[PADL_(l_int)]; l_int nsems; char nsems_r_[PADR_(l_int)];
char semflg_l_[PADL_(l_int)]; l_int semflg; char semflg_r_[PADR_(l_int)];
};
-struct linux_semop_args {
- char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
- char tsops_l_[PADL_(struct l_sembuf *)]; struct l_sembuf * tsops; char tsops_r_[PADR_(struct l_sembuf *)];
- char nsops_l_[PADL_(l_uint)]; l_uint nsops; char nsops_r_[PADR_(l_uint)];
-};
struct linux_semctl_args {
char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
char semnum_l_[PADL_(l_int)]; l_int semnum; char semnum_r_[PADR_(l_int)];
@@ -1450,7 +1445,6 @@ int linux_wait4(struct thread *, struct linux_wait4_args *);
int linux_kill(struct thread *, struct linux_kill_args *);
int linux_newuname(struct thread *, struct linux_newuname_args *);
int linux_semget(struct thread *, struct linux_semget_args *);
-int linux_semop(struct thread *, struct linux_semop_args *);
int linux_semctl(struct thread *, struct linux_semctl_args *);
int linux_shmdt(struct thread *, struct linux_shmdt_args *);
int linux_msgget(struct thread *, struct linux_msgget_args *);
@@ -1748,7 +1742,6 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *);
#define LINUX_SYS_AUE_linux_kill AUE_KILL
#define LINUX_SYS_AUE_linux_newuname AUE_NULL
#define LINUX_SYS_AUE_linux_semget AUE_NULL
-#define LINUX_SYS_AUE_linux_semop AUE_NULL
#define LINUX_SYS_AUE_linux_semctl AUE_NULL
#define LINUX_SYS_AUE_linux_shmdt AUE_NULL
#define LINUX_SYS_AUE_linux_msgget AUE_NULL
diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h
index ca83b9d33483..9fc5e8ca877f 100644
--- a/sys/amd64/linux/linux_syscall.h
+++ b/sys/amd64/linux/linux_syscall.h
@@ -70,7 +70,7 @@
#define LINUX_SYS_linux_kill 62
#define LINUX_SYS_linux_newuname 63
#define LINUX_SYS_linux_semget 64
-#define LINUX_SYS_linux_semop 65
+#define LINUX_SYS_semop 65
#define LINUX_SYS_linux_semctl 66
#define LINUX_SYS_linux_shmdt 67
#define LINUX_SYS_linux_msgget 68
diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c
index 285e9d47c461..68d3561e5fa7 100644
--- a/sys/amd64/linux/linux_syscalls.c
+++ b/sys/amd64/linux/linux_syscalls.c
@@ -72,7 +72,7 @@ const char *linux_syscallnames[] = {
"linux_kill", /* 62 = linux_kill */
"linux_newuname", /* 63 = linux_newuname */
"linux_semget", /* 64 = linux_semget */
- "linux_semop", /* 65 = linux_semop */
+ "semop", /* 65 = semop */
"linux_semctl", /* 66 = linux_semctl */
"linux_shmdt", /* 67 = linux_shmdt */
"linux_msgget", /* 68 = linux_msgget */
diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c
index ab22300ae25f..18a5914433b1 100644
--- a/sys/amd64/linux/linux_sysent.c
+++ b/sys/amd64/linux/linux_sysent.c
@@ -82,7 +82,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_kill_args), .sy_call = (sy_call_t *)linux_kill, .sy_auevent = AUE_KILL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 62 = linux_kill */
{ .sy_narg = AS(linux_newuname_args), .sy_call = (sy_call_t *)linux_newuname, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = linux_newuname */
{ .sy_narg = AS(linux_semget_args), .sy_call = (sy_call_t *)linux_semget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 64 = linux_semget */
- { .sy_narg = AS(linux_semop_args), .sy_call = (sy_call_t *)linux_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 65 = linux_semop */
+ { .sy_narg = AS(semop_args), .sy_call = (sy_call_t *)sys_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 65 = semop */
{ .sy_narg = AS(linux_semctl_args), .sy_call = (sy_call_t *)linux_semctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = linux_semctl */
{ .sy_narg = AS(linux_shmdt_args), .sy_call = (sy_call_t *)linux_shmdt, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 67 = linux_shmdt */
{ .sy_narg = AS(linux_msgget_args), .sy_call = (sy_call_t *)linux_msgget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 68 = linux_msgget */
diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index d75083ffe47c..d809b5658e4b 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -577,12 +577,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 3;
break;
}
- /* linux_semop */
+ /* semop */
case 65: {
- struct linux_semop_args *p = params;
+ struct semop_args *p = params;
iarg[a++] = p->semid; /* l_int */
- uarg[a++] = (intptr_t)p->tsops; /* struct l_sembuf * */
- iarg[a++] = p->nsops; /* l_uint */
+ uarg[a++] = (intptr_t)p->sops; /* struct sembuf * */
+ iarg[a++] = p->nsops; /* l_size_t */
*n_args = 3;
break;
}
@@ -3719,17 +3719,17 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
};
break;
- /* linux_semop */
+ /* semop */
case 65:
switch (ndx) {
case 0:
p = "l_int";
break;
case 1:
- p = "userland struct l_sembuf *";
+ p = "userland struct sembuf *";
break;
case 2:
- p = "l_uint";
+ p = "l_size_t";
break;
default:
break;
@@ -7436,7 +7436,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_semop */
+ /* semop */
case 65:
if (ndx == 0 || ndx == 1)
p = "int";
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index f75422c9e8c3..04773751ae16 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -733,11 +733,6 @@ struct linux_semctl_args {
struct linux_semtimedop_args {
syscallarg_t dummy;
};
-struct linux_semop_args {
- char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
- char tsops_l_[PADL_(struct l_sembuf *)]; struct l_sembuf * tsops; char tsops_r_[PADR_(struct l_sembuf *)];
- char nsops_l_[PADL_(l_uint)]; l_uint nsops; char nsops_r_[PADR_(l_uint)];
-};
struct linux_shmget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];
char size_l_[PADL_(l_size_t)]; l_size_t size; char size_r_[PADR_(l_size_t)];
@@ -1355,7 +1350,6 @@ int linux_msgsnd(struct thread *, struct linux_msgsnd_args *);
int linux_semget(struct thread *, struct linux_semget_args *);
int linux_semctl(struct thread *, struct linux_semctl_args *);
int linux_semtimedop(struct thread *, struct linux_semtimedop_args *);
-int linux_semop(struct thread *, struct linux_semop_args *);
int linux_shmget(struct thread *, struct linux_shmget_args *);
int linux_shmctl(struct thread *, struct linux_shmctl_args *);
int linux_shmat(struct thread *, struct linux_shmat_args *);
@@ -1604,7 +1598,6 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *);
#define LINUX_SYS_AUE_linux_semget AUE_NULL
#define LINUX_SYS_AUE_linux_semctl AUE_NULL
#define LINUX_SYS_AUE_linux_semtimedop AUE_NULL
-#define LINUX_SYS_AUE_linux_semop AUE_NULL
#define LINUX_SYS_AUE_linux_shmget AUE_NULL
#define LINUX_SYS_AUE_linux_shmctl AUE_NULL
#define LINUX_SYS_AUE_linux_shmat AUE_NULL
diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h
index ab4fb534a8cb..b3d01a89d0a1 100644
--- a/sys/arm64/linux/linux_syscall.h
+++ b/sys/arm64/linux/linux_syscall.h
@@ -188,7 +188,7 @@
#define LINUX_SYS_linux_semget 190
#define LINUX_SYS_linux_semctl 191
#define LINUX_SYS_linux_semtimedop 192
-#define LINUX_SYS_linux_semop 193
+#define LINUX_SYS_semop 193
#define LINUX_SYS_linux_shmget 194
#define LINUX_SYS_linux_shmctl 195
#define LINUX_SYS_linux_shmat 196
diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c
index 21bb3ccf88f6..6dbb988814ea 100644
--- a/sys/arm64/linux/linux_syscalls.c
+++ b/sys/arm64/linux/linux_syscalls.c
@@ -200,7 +200,7 @@ const char *linux_syscallnames[] = {
"linux_semget", /* 190 = linux_semget */
"linux_semctl", /* 191 = linux_semctl */
"linux_semtimedop", /* 192 = linux_semtimedop */
- "linux_semop", /* 193 = linux_semop */
+ "semop", /* 193 = semop */
"linux_shmget", /* 194 = linux_shmget */
"linux_shmctl", /* 195 = linux_shmctl */
"linux_shmat", /* 196 = linux_shmat */
diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c
index c3e19723f442..110ab7fe9672 100644
--- a/sys/arm64/linux/linux_sysent.c
+++ b/sys/arm64/linux/linux_sysent.c
@@ -210,7 +210,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_semget_args), .sy_call = (sy_call_t *)linux_semget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 190 = linux_semget */
{ .sy_narg = AS(linux_semctl_args), .sy_call = (sy_call_t *)linux_semctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 191 = linux_semctl */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 192 = linux_semtimedop */
- { .sy_narg = AS(linux_semop_args), .sy_call = (sy_call_t *)linux_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 193 = linux_semop */
+ { .sy_narg = AS(semop_args), .sy_call = (sy_call_t *)sys_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 193 = semop */
{ .sy_narg = AS(linux_shmget_args), .sy_call = (sy_call_t *)linux_shmget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 194 = linux_shmget */
{ .sy_narg = AS(linux_shmctl_args), .sy_call = (sy_call_t *)linux_shmctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 195 = linux_shmctl */
{ .sy_narg = AS(linux_shmat_args), .sy_call = (sy_call_t *)linux_shmat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 196 = linux_shmat */
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index c6410add7f80..a0cd747816c7 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -1515,12 +1515,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 0;
break;
}
- /* linux_semop */
+ /* semop */
case 193: {
- struct linux_semop_args *p = params;
+ struct semop_args *p = params;
iarg[a++] = p->semid; /* l_int */
- uarg[a++] = (intptr_t)p->tsops; /* struct l_sembuf * */
- iarg[a++] = p->nsops; /* l_uint */
+ uarg[a++] = (intptr_t)p->sops; /* struct sembuf * */
+ iarg[a++] = p->nsops; /* l_size_t */
*n_args = 3;
break;
}
@@ -4836,17 +4836,17 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
/* linux_semtimedop */
case 192:
break;
- /* linux_semop */
+ /* semop */
case 193:
switch (ndx) {
case 0:
p = "l_int";
break;
case 1:
- p = "userland struct l_sembuf *";
+ p = "userland struct sembuf *";
break;
case 2:
- p = "l_uint";
+ p = "l_size_t";
break;
default:
break;
@@ -7038,7 +7038,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_semtimedop */
case 192:
- /* linux_semop */
+ /* semop */
case 193:
if (ndx == 0 || ndx == 1)
p = "int";