From nobody Wed Aug 28 07:31:10 2024 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 4Wtx0t5k0Wz5PWbV; Wed, 28 Aug 2024 07:31:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wtx0t5D7Kz4gfV; Wed, 28 Aug 2024 07:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724830270; 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=C1Wwz95sQlBROezyh9+sMRdPvCrSHTgdnFLsvcdfV3c=; b=f/h3s4Hcni8PUzO4p4H1ontsqN4gyxqHPNNIPZA0qgkstVzLV1NTLRCY6KT2fLT1i18o1S mO2tck5xsbjeJuESRijgusBHG0U1LG2XJNicOjj+NIWw+4BNly9PboGtEJynqz7pTdT8ro 4rn1g+HGP1ky9J4zkt0QDo+4rEgJnS822XAxFN7KKLBMOOpKHsp2H8AZ1j5T/pLBdjLN0D 6Oo0wwBpx0ZXYJdHSyfdbE7iCIl5gHNMiP6ANr17B3vnpHy7RA+7jG1gTMrPMbQv6cA8p8 vDLZIl7I5jrkMypYBreo9TnQPkuyyiijT0kWjFEwwkf+Xt3Io/6CPWjZdE7LrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724830270; a=rsa-sha256; cv=none; b=DGoLpkmLcOD9qxOCioeXwkRUpBnWx6c16ehl+74Qfd/0HM7ovNmoDHqZf1s3D5PGsDDBI9 So+vFn9ZL6+zOAcotywoBpa3B7hPzuRuRaBtVu0OB0wPtMyJknVwLm2bQX4+3+LdxDf8qw dy8OLI47aOc3JFO3mX0yssx8oplNXDKGeGlmprkD2XZxQv9TeBO/pKO33SYjna3xmd1qNy N9/XOfF/ECaazRSLk1pAW/3b/kHNrQImzqG3m/FCCRupg+WjlHTCxXuRWMHpvnA0SqrppM /ar9RJpcbFmzCCzn9BYjsrQf5Au/vkCDTqTLvPw2IsiQqTYwlPcgPwBMRHUP4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724830270; 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=C1Wwz95sQlBROezyh9+sMRdPvCrSHTgdnFLsvcdfV3c=; b=kX2+ipPqC0oSBLWs0ujmjg5kmRRrXgMNcyOR45wUjcLOHvuiDMCrOSfPeSYLew2uOKTCiE aLiUAHTjm9jxc4pFzWa4Nbb/AAv/OkaPbSxG/tTWB52xThyXTH8Xkt4CdfydNKJm1h5lNH 8Q8wgZiI2KHkUvYy1yYRaBfxtD1YTFijU3QtPmvTG+0FPNxDqny7IzTJjSkBd37qVwsotc fqvut217mUxwGdd2ic1l1PQca7bnHP8lbjr9kSb2isa9wXF/TNxUAuGy5ouoNo+yFCbiB2 GqhB3YFa3Qn/QlneKBq9BgxPLRxXWRM5kWbgh7AD4Pv8I8HsUpJUeOIFEyZ8Mg== 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 4Wtx0t4pk1zPRC; Wed, 28 Aug 2024 07:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47S7VA0v062807; Wed, 28 Aug 2024 07:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47S7VAcD062804; Wed, 28 Aug 2024 07:31:10 GMT (envelope-from git) Date: Wed, 28 Aug 2024 07:31:10 GMT Message-Id: <202408280731.47S7VAcD062804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 84f46335ab5d - main - linuxkpi: chase spinlock_t in DECLARE_WAIT_QUEUE_HEAD 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84f46335ab5da086c74032579799c0a74aa27447 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=84f46335ab5da086c74032579799c0a74aa27447 commit 84f46335ab5da086c74032579799c0a74aa27447 Author: Evgenii Khramtsov <2khramtsov@gmail.com> AuthorDate: 2024-08-27 11:21:39 +0000 Commit: Emmanuel Vadot CommitDate: 2024-08-28 07:29:40 +0000 linuxkpi: chase spinlock_t in DECLARE_WAIT_QUEUE_HEAD Remove member m to unbreak consumers, e.g. drm-kmod 5.10-lts branch. [...] /tmp/drm-kmod/drivers/gpu/drm/ttm/ttm_module.c:38:8: error: no member named 'm' in 'struct mtx' 38 | static DECLARE_WAIT_QUEUE_HEAD(exit_q); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /tmp/src/sys/compat/linuxkpi/common/include/linux/wait.h:113:33: note: expanded from macro 'DECLARE_WAIT_QUEUE_HEAD' 113 | MTX_SYSINIT(name, &(name).lock.m, spin_lock_name("wqhead"), MTX_DEF) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /tmp/src/sys/sys/mutex.h:528:4: note: expanded from macro 'MTX_SYSINIT' 528 | (mtx), \ | ^~~ /tmp/drm-kmod/drivers/gpu/drm/ttm/ttm_module.c:38:8: error: no member named 'm' in 'struct mtx' 38 | static DECLARE_WAIT_QUEUE_HEAD(exit_q); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /tmp/src/sys/compat/linuxkpi/common/include/linux/wait.h:113:33: note: expanded from macro 'DECLARE_WAIT_QUEUE_HEAD' 113 | MTX_SYSINIT(name, &(name).lock.m, spin_lock_name("wqhead"), MTX_DEF) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [...] Fixes: ae38a1a1bfdf ("linuxkpi: spinlock: Simplify code") MFC after: ? --- sys/compat/linuxkpi/common/include/linux/wait.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/wait.h b/sys/compat/linuxkpi/common/include/linux/wait.h index b815050b6faa..309c7816aa7b 100644 --- a/sys/compat/linuxkpi/common/include/linux/wait.h +++ b/sys/compat/linuxkpi/common/include/linux/wait.h @@ -110,7 +110,7 @@ extern wait_queue_func_t default_wake_function; wait_queue_head_t name = { \ .task_list = LINUX_LIST_HEAD_INIT(name.task_list), \ }; \ - MTX_SYSINIT(name, &(name).lock.m, spin_lock_name("wqhead"), MTX_DEF) + MTX_SYSINIT(name, &(name).lock, spin_lock_name("wqhead"), MTX_DEF) #define init_waitqueue_head(wqh) do { \ mtx_init(&(wqh)->lock, spin_lock_name("wqhead"), \