From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 01:09:18 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 9C089661BA5; Sun, 18 Jul 2021 01:09:18 +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 4GS6M24320z4Yp6; Sun, 18 Jul 2021 01:09:18 +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 6F3BE1A8BA; Sun, 18 Jul 2021 01:09:18 +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 16I19IZG090977; Sun, 18 Jul 2021 01:09:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I19IXt090976; Sun, 18 Jul 2021 01:09:18 GMT (envelope-from git) Date: Sun, 18 Jul 2021 01:09:18 GMT Message-Id: <202107180109.16I19IXt090976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Neel Chauhan Subject: git: 511bbe502e8a - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 511bbe502e8ad50d7b22feefec7bb7c2534a7571 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 01:09:18 -0000 The branch stable/13 has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=511bbe502e8ad50d7b22feefec7bb7c2534a7571 commit 511bbe502e8ad50d7b22feefec7bb7c2534a7571 Author: Neel Chauhan AuthorDate: 2021-07-15 14:52:42 +0000 Commit: Neel Chauhan CommitDate: 2021-07-18 01:08:06 +0000 linuxkpi: Add spin_trylock_irqsave() macro This is needed by the drm-kmod 5.6 update. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D30706 (cherry picked from commit 086cfe4df8ab237f0cf156e95d36657250931981) --- 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 ca51fd23434c..458d8d9f8da9 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; \