Date: Wed, 22 Apr 2026 19:21:27 +0000 From: Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ricardo Branco <rbranco@suse.de> Subject: git: 81f60a964a50 - main - linux: make sysent for membarrier Message-ID: <69e91fb7.1de7b.7f234756@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=81f60a964a50b9c22361bb811be9ca089561e80c commit 81f60a964a50b9c22361bb811be9ca089561e80c Author: Ricardo Branco <rbranco@suse.de> AuthorDate: 2026-04-18 10:18:12 +0000 Commit: Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org> CommitDate: 2026-04-22 19:16:44 +0000 linux: make sysent for membarrier Regenerate linux syscall prototypes for membarrier(2). Signed-off-by: Ricardo Branco <rbranco@suse.de> PR: 281691 Reviewed by: kib, pouria Pull-Request: https://github.com/freebsd/freebsd-src/pull/2147 --- sys/amd64/linux/linux_proto.h | 3 ++- sys/amd64/linux/linux_systrace_args.c | 8 ++++++-- sys/amd64/linux32/linux32_proto.h | 3 ++- sys/amd64/linux32/linux32_systrace_args.c | 8 ++++++-- sys/arm64/linux/linux_proto.h | 3 ++- sys/arm64/linux/linux_systrace_args.c | 8 ++++++-- sys/i386/linux/linux_proto.h | 3 ++- sys/i386/linux/linux_systrace_args.c | 8 ++++++-- 8 files changed, 32 insertions(+), 12 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index f1d9c96a78d7..2373eff31dd3 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -1276,7 +1276,8 @@ struct linux_userfaultfd_args { }; struct linux_membarrier_args { char cmd_l_[PADL_(l_int)]; l_int cmd; char cmd_r_[PADR_(l_int)]; - char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; + char cpu_id_l_[PADL_(l_int)]; l_int cpu_id; char cpu_id_r_[PADR_(l_int)]; }; struct linux_mlock2_args { char start_l_[PADL_(l_ulong)]; l_ulong start; char start_r_[PADR_(l_ulong)]; diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index 1dc4de019080..902a0c1619b1 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -2539,8 +2539,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 324: { struct linux_membarrier_args *p = params; iarg[a++] = p->cmd; /* l_int */ - iarg[a++] = p->flags; /* l_int */ - *n_args = 2; + iarg[a++] = p->flags; /* l_uint */ + iarg[a++] = p->cpu_id; /* l_int */ + *n_args = 3; break; } /* linux_mlock2 */ @@ -6948,6 +6949,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: + p = "l_uint"; + break; + case 2: p = "l_int"; break; default: diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 57a303271f1c..3f13c6df5fc5 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1420,7 +1420,8 @@ struct linux_userfaultfd_args { }; struct linux_membarrier_args { char cmd_l_[PADL_(l_int)]; l_int cmd; char cmd_r_[PADR_(l_int)]; - char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; + char cpu_id_l_[PADL_(l_int)]; l_int cpu_id; char cpu_id_r_[PADR_(l_int)]; }; struct linux_mlock2_args { char start_l_[PADL_(l_ulong)]; l_ulong start; char start_r_[PADR_(l_ulong)]; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index cbd1641c2a34..0bfbca2a0f37 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -2782,8 +2782,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 375: { struct linux_membarrier_args *p = params; iarg[a++] = p->cmd; /* l_int */ - iarg[a++] = p->flags; /* l_int */ - *n_args = 2; + iarg[a++] = p->flags; /* l_uint */ + iarg[a++] = p->cpu_id; /* l_int */ + *n_args = 3; break; } /* linux_mlock2 */ @@ -7857,6 +7858,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: + p = "l_uint"; + break; + case 2: p = "l_int"; break; default: diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 82f57f77ffae..ad0146b8527f 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -1083,7 +1083,8 @@ struct linux_userfaultfd_args { }; struct linux_membarrier_args { char cmd_l_[PADL_(l_int)]; l_int cmd; char cmd_r_[PADR_(l_int)]; - char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; + char cpu_id_l_[PADL_(l_int)]; l_int cpu_id; char cpu_id_r_[PADR_(l_int)]; }; struct linux_mlock2_args { char start_l_[PADL_(l_ulong)]; l_ulong start; char start_r_[PADR_(l_ulong)]; diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 1b946a9406a5..3d480b31bcd9 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -2156,8 +2156,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 283: { struct linux_membarrier_args *p = params; iarg[a++] = p->cmd; /* l_int */ - iarg[a++] = p->flags; /* l_int */ - *n_args = 2; + iarg[a++] = p->flags; /* l_uint */ + iarg[a++] = p->cpu_id; /* l_int */ + *n_args = 3; break; } /* linux_mlock2 */ @@ -6015,6 +6016,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: + p = "l_uint"; + break; + case 2: p = "l_int"; break; default: diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 49f002a633d2..255c2ec7494b 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1414,7 +1414,8 @@ struct linux_userfaultfd_args { }; struct linux_membarrier_args { char cmd_l_[PADL_(l_int)]; l_int cmd; char cmd_r_[PADR_(l_int)]; - char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; + char cpu_id_l_[PADL_(l_int)]; l_int cpu_id; char cpu_id_r_[PADR_(l_int)]; }; struct linux_mlock2_args { char start_l_[PADL_(l_ulong)]; l_ulong start; char start_r_[PADR_(l_ulong)]; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 563d1a795ae1..739d417bca6e 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -2813,8 +2813,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 375: { struct linux_membarrier_args *p = params; iarg[a++] = p->cmd; /* l_int */ - iarg[a++] = p->flags; /* l_int */ - *n_args = 2; + iarg[a++] = p->flags; /* l_uint */ + iarg[a++] = p->cpu_id; /* l_int */ + *n_args = 3; break; } /* linux_mlock2 */ @@ -7913,6 +7914,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: + p = "l_uint"; + break; + case 2: p = "l_int"; break; default:home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e91fb7.1de7b.7f234756>