From nobody Thu Oct 24 07:25:18 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 4XYy9q0YwKz5bB3D; Thu, 24 Oct 2024 07:25:19 +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 4XYy9p6Yndz4Y05; Thu, 24 Oct 2024 07:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729754718; 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=XVt1vYvXGnRMZNnMERzTgxaW85VfgFNzNlErIcqysBc=; b=ULpWtVfTqYtd6cI409+h85MIQ8mgMvmYst66wR9d0RGQglZbeRnPzLMDEOE3y7/9LxlkAP /RnlmhiHRhFQTrl/FpRhDjgIJcujVoYDya2HXy0+E9OuoCPM71MqdmJYZxShp+0TsWsqp/ 27kJL8bzndPza5ZJvnAwMiL673iK1lHatBW1X1xy/3r4cTzvKnkqocugnExwJhQWXBG/7d gzjgeZD1pb3oO8sgBBwE6fI1ql5MIamP8KuYWs0TCBITsGolyYLaDA2Q2NbdoVDbSYsJAM 8aCQXBv2t2QUckhXVxamRMZAuVEU2OGsgMV+lIw6bmcLcXJod20dvORZM3YLsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729754718; 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=XVt1vYvXGnRMZNnMERzTgxaW85VfgFNzNlErIcqysBc=; b=JlHxa+iLsdUqsBLld0Wc6W1xl6M3ToVbOS26wEyn0OEOFVaIbHjIQ1x7r1NsyeQ239BUQ6 H6phhfH4ZymXeoC0faykjfxLxnHhGE1MIsP5Nrbunr4UORMLt2Z9eT7+WfOaCWl5Uq/oWG YDu9hIXsbDw0L/jx19n2j0GMtHHVvFb833U4MBirXWctF7HUjIHUH9dFvFP9Ap7rnSVNOf vMyceqKSY6IGGUeIhu6DN/Ks4OzLoV9iEewgypaQwSdWQrtt90+2VMpZd6k3Ddd0tepJKP 6UCe6ExZmkrrUnQF17Feoag2Zjzz4NBYqrxp7MuwNHL17RgoXzgTb2+/yeNRHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729754718; a=rsa-sha256; cv=none; b=w5nED1sWIr3vHmBnC5gDDzMs1Df6EE9FdKXDzMfHLh1d8QyX4K3tZtGSu8hCqk8elFOllw JdiZVJvZK3c4EsZvheDAtdZRouKP2nt7j+M2hvg8fpqHKR0vU8Jbq9t9DAWjZJ/Ss79Rro UNTbUQOCDwKwb6iVwqMUvhL08/h4MR9WDw/z1ukWyy6rCVkM9DQr6HoNQRLGYbJDy3VxTa 7m1h+YJkpv6cymHsvS020XQ2+JAli+E1gSSbrEfcbWx7AhL/W20h4e0y21hoR4HaDQ/yOC O4a4exgb46H3OIXeWNaPHjunImniHLoVNuZxFetdcwFk2iOPDWnmq4lD+5esqQ== 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 4XYy9p62RDzYJ8; Thu, 24 Oct 2024 07:25:18 +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 49O7PI6h006683; Thu, 24 Oct 2024 07:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O7PI0t006680; Thu, 24 Oct 2024 07:25:18 GMT (envelope-from git) Date: Thu, 24 Oct 2024 07:25:18 GMT Message-Id: <202410240725.49O7PI0t006680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 089664a8db2e - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 089664a8db2e16493a4e976939c2237d43f81ada Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=089664a8db2e16493a4e976939c2237d43f81ada commit 089664a8db2e16493a4e976939c2237d43f81ada Author: Evgenii Khramtsov <2khramtsov@gmail.com> AuthorDate: 2024-08-27 11:21:39 +0000 Commit: Emmanuel Vadot CommitDate: 2024-10-24 07:24:52 +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: ? (cherry picked from commit 84f46335ab5da086c74032579799c0a74aa27447) --- 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"), \