From nobody Fri Nov 24 09:50:28 2023 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 4Sc9Fw2R4zz522Qf; Fri, 24 Nov 2023 09:50:28 +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 4Sc9Fw1zqPz4FFg; Fri, 24 Nov 2023 09:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700819428; 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=tenXvimy+VWzdPLXGz6GBi4V8KibvmYxHW9JxOcQIGY=; b=eZCy5+D1sEjKQ1A2doW0lexVwsYpVpVwd8xix8U2XlOZ9oxf9F1zidsjVwlie1Qo4eFM4H Z+u2WxutytM/yA3m3jWhdo9c1T+PAtm9s5o5MLz0pdSrVqqHny+rJruMxzroGXV21XiM99 QxzxW7S9zj5Wwji31I0lDjp9xNK7d/uBNk3IvK9SFURYEUL5AtndL9yR6i/kqDoDhjuiet ddjtgOlukYe02MITYzn52ic7aRgaATQ4x/6mtnoiKklY2NolG+wgeBa1T8jR0DsFGaJ5WZ qkTSXQ3pUQ1oZlPeO01q5cc8tGv1Ra9+PHyLTGN0PeuPp+Oy/GKo6nIo7LXnqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700819428; 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=tenXvimy+VWzdPLXGz6GBi4V8KibvmYxHW9JxOcQIGY=; b=g7bCs42L0QtktlckJVwwh03SP8xIyPBeK06t3+YQGLBuw3THMS21EluoWUDDqZ0o0LrEfl r0H38LWBZPIx97Vo7SWOr65Y5WxHV9OIR0GgRZTuhqSGDdSL1hUT4+3q5NP1eSJPAy4625 WIIyzSqLfXIL2XiIpKo+COBXWj1EENE/skOhSYSzxJMI+ZmDhGVokXnrDka7DR6txOAbih tWiB0J/cUBKGXxIixf+s/a1tZn1J+RHU+akJmxwRK9cGS5f8GYZJtAubeDoQ1FQv8pq8/E RQ5540FrR3WR6D68b9uu8BEA4HHhX+LOkE58mwZpYA8TFYTTUNEuGOoK61YcUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700819428; a=rsa-sha256; cv=none; b=AqbuqE9jvNr1h9uGpKFlR6d9cya+nH7vSle4ocexcnv1eK4Apy4luv/ibaC6b+yNpS3Sg3 YuuLcSTCpr5BoQSuO5oOeYzU00vFiCmftb/Nd5alX3nvhWwb3JR1y6xR+9P3nnf872Z3Vi J+urecn1Ac2LC44bmPsS1RNJIJ/HMODF++mZojRY9EOSU2HcRFSW6hC2Kk3yD4msBl62Tc Xx33s6qo2iEI+BBlKDGdAUJ+cxvBUYLkLcxnulezQTJxw/qFIKAiHK8a81OI/jZbsJZOZ1 Qn1l1sKNNX8S3YSFqrCrYr4SDGzbJfwMoYjcm2a7Q1HSrI/nN2aUzDdUXHY/cA== 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 4Sc9Fw13QHzgNj; Fri, 24 Nov 2023 09:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AO9oSNF089172; Fri, 24 Nov 2023 09:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO9oSeH089169; Fri, 24 Nov 2023 09:50:28 GMT (envelope-from git) Date: Fri, 24 Nov 2023 09:50:28 GMT Message-Id: <202311240950.3AO9oSeH089169@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: 2a35f3cdf63d - main - sys/mutex.h: Include sys/lock.h instead of sys/_lock.h 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a35f3cdf63d1f9b1ea5ab0174adabb631757210 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2a35f3cdf63d1f9b1ea5ab0174adabb631757210 commit 2a35f3cdf63d1f9b1ea5ab0174adabb631757210 Author: Emmanuel Vadot AuthorDate: 2022-10-27 09:43:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-11-24 09:49:58 +0000 sys/mutex.h: Include sys/lock.h instead of sys/_lock.h It uses the LA_ defines when INVARIANTS is set. This unbreak dpaa2 with FDT only kernel (like ALLWINNER or ROCKCHIP) as the driver only include sys/lock.h via header polution for ACPI kernels. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37145 Reviewed by: kib, mjg --- sys/sys/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 56c03a1b0be9..750a5e99679a 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -34,8 +34,8 @@ #define _SYS_MUTEX_H_ #include -#include #include +#include #ifdef _KERNEL #include