From owner-dev-commits-src-main@freebsd.org Thu Jul 15 14:54:14 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 190046482F6;
Thu, 15 Jul 2021 14:54:14 +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 4GQcpF6lJPz3ryG;
Thu, 15 Jul 2021 14:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 CBC1238AB;
Thu, 15 Jul 2021 14:54:13 +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 16FEsD4O026508;
Thu, 15 Jul 2021 14:54:13 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FEsDk1026507;
Thu, 15 Jul 2021 14:54:13 GMT (envelope-from git)
Date: Thu, 15 Jul 2021 14:54:13 GMT
Message-Id: <202107151454.16FEsDk1026507@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Neel Chauhan <nc@FreeBSD.org>
Subject: git: 086cfe4df8ab - main - linuxkpi: Add spin_trylock_irqsave() macro
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: nc
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 086cfe4df8ab237f0cf156e95d36657250931981
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jul 2021 14:54:14 -0000
The branch main has been updated by nc (ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=086cfe4df8ab237f0cf156e95d36657250931981
commit 086cfe4df8ab237f0cf156e95d36657250931981
Author: Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2021-07-15 14:52:42 +0000
Commit: Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2021-07-15 14:52:42 +0000
linuxkpi: Add spin_trylock_irqsave() macro
This is needed by the drm-kmod 5.6 update.
Reviewed by: hselasky
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D30706
---
sys/compat/linuxkpi/common/include/linux/spinlock.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h
index 46b1f8b9a180..56eaecfb4cd6 100644
--- a/sys/compat/linuxkpi/common/include/linux/spinlock.h
+++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h
@@ -104,6 +104,11 @@ typedef struct {
#define spin_trylock_irq(_l) \
spin_trylock(_l)
+#define spin_trylock_irqsave(_l, flags) ({ \
+ (flags) = 0; \
+ spin_trylock(_l); \
+})
+
#define spin_lock_nested(_l, _n) do { \
if (SPIN_SKIP()) \
break; \