From nobody Mon May 23 22:11:36 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 127EF1B349D8; Mon, 23 May 2022 22:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6Wkw6XnMz4nyb; Mon, 23 May 2022 22:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653343897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IOKLovdkyYKndQPeLbzVd318HuRF7OYa61ASXmtA6f8=; b=dI5mRSqBhm3z3cmnuCkEuLAcL4q6yCXW4x69WMTo9rm47Lv+wAyc2kiW8CuKN813c1bSVj /192LC5wALPLIxfX9JMqVIj+se3whRnBiFaIVOxmKSy1TIrIs9CAx8J07zRBa5kzp2WSVL scSzQNa0ben3/iid0WBPRBPBRDdmpj0CBTlQAGeG96PSS9J6dLone95DxFNtEypOZ5qD9t afqXyD+2Hcd6CNZajJoBJjK0DaLQdDeQuF3vITC52Ku9++mzwZbBIXztTeAQ7Sk2BclvKR 71KRkaBtC6Kh+W1nJZYtGTKHQl/OusTp2ThDay9/vGIHm2GDlNUjzJxJM2e57A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C13EC17D6D; Mon, 23 May 2022 22:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24NMBafO094578; Mon, 23 May 2022 22:11:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NMBa04094577; Mon, 23 May 2022 22:11:36 GMT (envelope-from git) Date: Mon, 23 May 2022 22:11:36 GMT Message-Id: <202205232211.24NMBa04094577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 529cf1271d3c - stable/12 - Fix the build after 47a57144 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 529cf1271d3c998c9e83347f7c431270cc5045f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653343897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IOKLovdkyYKndQPeLbzVd318HuRF7OYa61ASXmtA6f8=; b=HY8lRJb23f2DWMd+JaRyB8VanM8ExlR/XI4G5o6GzKSaDh5gbccSk3epMc/08YpeoZwP8V j7SrJsP7pjrlMgqMzzEn9OeDkdpmpqhJBFg7y9QiQHNivSOQjnQes0Pw7b2CoI5+AjZd3R 5UwdKZtTTAvpx74c6u7W6QXeNtR40h1sIDeyjbNdKU0SwWsgYr5N/WJA3MXn6oYspxq0Ez rAt7Ki+ZFL68eAiNwOmRxSgbINNhP2gsoXi2KvAkjg7qLlA9kX+mrmgBWxsI7o1aiRPP8C EEYJuIlAHRS+mH7kMUd2kbmb03itmRiSaZ69wMrYcFNaqO79hLafHAD0oDH/2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653343897; a=rsa-sha256; cv=none; b=w7NNRW9FQqXjPFOsmZsLEeaTeqVVE7aZZCUWrQ3lLRV+xggOqM8BpVbTBNLsg8/BStp383 2rgxxXdhrVWZl1A1FX8dY4kGj/aTCqBBcvx43IKgzU4iJ3yianSef4tmP344hUGOnqOJGG IgaVIr8+KPRux6oFu4wFqqPY0pmL4aba0CTDyZxBRad/ZhXZ/bUOzVXeHgE1tZiHKw/85v Ir5c2rPIqi87OHvCkZZ5QpjRO1jAaAyU/AHCq/jE6LxCLrVavItLDECd7cWbvD0WSS5bfs dkP03pKbq079626pQNP95XDswPjCz7a6DwYQd3TRsbCqrfq0QXGUu2ki6izaRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=529cf1271d3c998c9e83347f7c431270cc5045f4 commit 529cf1271d3c998c9e83347f7c431270cc5045f4 Author: Dmitry Chagin AuthorDate: 2022-05-19 18:40:59 +0000 Commit: Justin Hibbits 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 {