Date: Mon, 23 May 2022 22:11:36 GMT From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 529cf1271d3c - stable/12 - Fix the build after 47a57144 Message-ID: <202205232211.24NMBa04094577@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=529cf1271d3c998c9e83347f7c431270cc5045f4 commit 529cf1271d3c998c9e83347f7c431270cc5045f4 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-05-19 18:40:59 +0000 Commit: Justin Hibbits <jhibbits@FreeBSD.org> CommitDate: 2022-05-23 19:15:49 +0000 Fix the build after 47a57144 (cherry picked from commit 89737eb8290a10d96b77afac1b68e4740b43353b) --- sys/compat/linux/linux_misc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index d436aadf0035..547f3fe7a22c 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2023,6 +2023,11 @@ linux_sched_getparam(struct thread *td, return (error); } +static const struct cpuset_copy_cb copy_set = { + .copyin = copyin, + .copyout = copyout +}; + /* * Get affinity of a process. */ @@ -2043,7 +2048,8 @@ linux_sched_getaffinity(struct thread *td, PROC_UNLOCK(tdt->td_proc); error = kern_cpuset_getaffinity(td, CPU_LEVEL_WHICH, CPU_WHICH_TID, - tdt->td_tid, sizeof(cpuset_t), (cpuset_t *)args->user_mask_ptr); + tdt->td_tid, sizeof(cpuset_t), (cpuset_t *)args->user_mask_ptr, + ©_set); if (error == 0) td->td_retval[0] = sizeof(cpuset_t); @@ -2069,7 +2075,8 @@ linux_sched_setaffinity(struct thread *td, PROC_UNLOCK(tdt->td_proc); return (kern_cpuset_setaffinity(td, CPU_LEVEL_WHICH, CPU_WHICH_TID, - tdt->td_tid, sizeof(cpuset_t), (cpuset_t *) args->user_mask_ptr)); + tdt->td_tid, sizeof(cpuset_t), (cpuset_t *) args->user_mask_ptr, + ©_set)); } struct linux_rlimit64 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205232211.24NMBa04094577>