diff options
| author | Ricardo Branco <rbranco@suse.de> | 2026-04-18 10:18:12 +0000 |
|---|---|---|
| committer | Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org> | 2026-04-22 19:16:44 +0000 |
| commit | 81f60a964a50b9c22361bb811be9ca089561e80c (patch) | |
| tree | 10e87524087367990a93cb316215da582858147d /sys/amd64 | |
| parent | 1594fe0b1029f246b3a14c8b21637091968362aa (diff) | |
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/linux/linux_proto.h | 3 | ||||
| -rw-r--r-- | sys/amd64/linux/linux_systrace_args.c | 8 | ||||
| -rw-r--r-- | sys/amd64/linux32/linux32_proto.h | 3 | ||||
| -rw-r--r-- | sys/amd64/linux32/linux32_systrace_args.c | 8 |
4 files changed, 16 insertions, 6 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: |