From nobody Mon May 23 22:11:40 2022 X-Original-To: dev-commits-src-all@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 D20CB1B34F9B; Mon, 23 May 2022 22:11:40 +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 4L6Wl03w6Fz4p98; Mon, 23 May 2022 22:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653343900; 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=hASlvop+Cw3/NMba1e0caoA2LpORuzwmanM+8oPzmKI=; b=OMAJa1PdgN7Kkzp2p2yN6oj0AZNDiqevV7aovbmjHDCjOZzTk95C29Nomp1m44OYKYZ2sM yhCjdibMFyGFdf0FxeQI64BcvKjG/WdwKGTnHTbdweqW1buPZ00Sqcm+b95TKYllbuFTF4 9CmoJDY7mvMChpvzUCVHK+GhlGsCXtY4IAj04t9EK2r6sLN74EDrIrDSsFIAiHd9in/lbX ADB/+P0dbSk8dzK8/NP3lFXSZxX49PgIxTIFIhchT80W6jtoSZsi1KqX9C7hzSDs7UCmCe QMuLEYPGTJ4hK0t7uy6uio3ZYCyFRSMnRRn98B+wGvu+H6/HquNW32RY8yxxxw== 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 32C19185A2; Mon, 23 May 2022 22:11:40 +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 24NMBefP094669; Mon, 23 May 2022 22:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NMBeMw094668; Mon, 23 May 2022 22:11:40 GMT (envelope-from git) Date: Mon, 23 May 2022 22:11:40 GMT Message-Id: <202205232211.24NMBeMw094668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 01f281d0ee52 - stable/13 - Fix the build after 47a57144 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 01f281d0ee528a5b2a08d12ad6c91aeb8beb9419 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653343900; 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=hASlvop+Cw3/NMba1e0caoA2LpORuzwmanM+8oPzmKI=; b=TgX41uhhaDp+aG/D6qWQ4vVu00gaGC2Bokdj9N20Zu4zmCqan36Pzi/0psTo22GSjVR/v1 yXWxwjr1i+TR1L4M3SIuUbr5fiFouqNnBgpvo6/AeDm+eyTvGzO/UPj9yNvrRnuP57ykHU crZC165l1Y3L86tPt+dOpNibIfeTvpeO42uZ+V5VwFOG2ZShv2EiIRUj83eSH4tL+Nfprv QBdJFSWusaPpxBQizenmFlUmg3pI5c6EX1hzoOO/cVqlcveZ5IxvNDNNL6SoV1P5asx3Cz 2rUNMijohdCRYY3/CPhPGSezDw8xAvg7chg/mVLog1esxDxvP3GCU827gtYLKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653343900; a=rsa-sha256; cv=none; b=S3mH9jaapCn1PZAh+yUTcUnBGlj0oXQJ2eZMRjjyDazYMtr/xd7iZMWXL+NjfNBPLns1Sm tXmM5lZkKlM2g77YODVx9XUCC4EnQ286j0xXecFPgwi2v7L4T6G1iLOl9urdP5hqebyhYy o1ZLsN/PrWKtZ2iKDODJjfuyRnjMgrX79JuVK0fUhAiG3QJOfyPqUnRvp6Tt1M20lhl0qZ XjiKdzEmZ0+X3LMrsTaRKUL24mwEf8tjSNFPUZyYqL2X9RyrZLNmbkCxK1rg6D0Z43ffrR gTHEDlf1nCmAmD6Idln0a5AvFFbNuT8LEyx7gz/iLXGAqnLkpKABoqTF6x7qFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=01f281d0ee528a5b2a08d12ad6c91aeb8beb9419 commit 01f281d0ee528a5b2a08d12ad6c91aeb8beb9419 Author: Dmitry Chagin AuthorDate: 2022-05-19 18:40:59 +0000 Commit: Justin Hibbits CommitDate: 2022-05-23 22:11:22 +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 fb529f140d3e..e45a72ecebb7 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2172,6 +2172,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. */ @@ -2192,7 +2197,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); @@ -2218,7 +2224,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 {