From nobody Sat Feb 17 21:33:01 2024 X-Original-To: dev-commits-src-branches@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 4TchqL3sY9z59l12; Sat, 17 Feb 2024 21:33:02 +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 4TchqL0gKPz4hgT; Sat, 17 Feb 2024 21:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205582; 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=YdyMbZd6c9bax0QIG1pJ3plp9ccYVm7D6nuKwmxDQnw=; b=etLHt46Lkr7VinF9xizGVijgk1OPV0yKPiPcqaar0CVcZwstTbokJ8Qt4COchvTywt0EoX 2AzI2bWO+2hcueyoaFS65GMs0FjBHrgBxLntTIRE7KQUtmfjc2coF9u/EmUOu+6WtU+Vn3 7xaNhw9xK6shVPezIjRJNZYoE3itr/S41AfRI/gNMTDmPI0M8/rx7k5uw21BrEoJuIO+vw qQwyZ8YGGpOjUzwiO/swxOAfd/LadGAx2BY7m0E7O4/zg1yIK1p846abhot2d7phQgHwcl SvBThJtgK3dUHbRoxlxR9uj882n+3/Sxg21pi7/c4XK7uwfkYlVIrvTGYAzgZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205582; 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=YdyMbZd6c9bax0QIG1pJ3plp9ccYVm7D6nuKwmxDQnw=; b=weG1PIuWRHiH+/GGWzJEF7H/PkmS6Z4RIQu8/isCGBEJs+CCSRgbIlfYWIQ4TEhGcYeR/S yzkk+o24OAh7/veaz8E9k+GhQ7/qZBYB2vD/0qcZtXtLQDgjdvymgH5ZkEtZHQVAEMMiMm ovVXUfofaWibymhujsXJIxtHan+TVRuCkxMlK7Pv3ng4sm/wkxx/k7Fg+IprHpBbLcJX7D 72WMH8eqyeMjugmelr+zVw1ypn1/cVTQgLS9+2MkWXk0Sl926NLqiDXf6BM7aTIPgv0HTQ OuUfCSVbbELezVe3morhe9b7TqanSho0snYzvblyu6dEfIpKYbbODRJKKdqb0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205582; a=rsa-sha256; cv=none; b=Y0Z9NMwyc6EP3tjZN96+aRH+rqAYVdsSvT+qKWWq/mPsuooCMclmJfzyoOpfvsjrmMkTMu mmGOVUZ3GBiYhSizBgn9m1zFV83mVw8CsD4AtCbHq+aydahaC0EmNTNEFfOTZpMLyoMJ1D TLp5CGJbx6jLh3QQrpUbiy0IbZ7/11+1ayWnfmeuluBoM5JReKkA9xagYfXF3pYGCI8/mx oVwgi9fG0xrMZ0Kzut4krQsf672m7iYLsb9drcuPkvCWbdyFFEGGnqqGAKXL05bAa8GBX/ BMaUa+oLKcpLzB7uzRwLXRjCHnVtu0RVPXkXj8aiThFSmrwYreSRa+h3mD+q5Q== 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 4TchqK6tM5zPZY; Sat, 17 Feb 2024 21:33:01 +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 41HLX1iL020867; Sat, 17 Feb 2024 21:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLX1a8020862; Sat, 17 Feb 2024 21:33:01 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:33:01 GMT Message-Id: <202402172133.41HLX1a8020862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 67cc189db497 - stable/14 - LinuxKPI: Add IOMEM_ERR_PTR() to linux/io.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67cc189db497feb752abe29b22d017b5e91af8bf Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=67cc189db497feb752abe29b22d017b5e91af8bf commit 67cc189db497feb752abe29b22d017b5e91af8bf Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:37 +0000 LinuxKPI: Add IOMEM_ERR_PTR() to linux/io.h The function creates an error pointer. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42805 (cherry picked from commit af787b8e8b803dbb2c6bd06629974ba39bd0fb70) --- sys/compat/linuxkpi/common/include/linux/io.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index b0a4109f3afb..d70cda77400e 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -35,6 +35,7 @@ #include #include +#include #include #if !defined(__arm__) #include @@ -528,6 +529,8 @@ memunmap(void *addr) iounmap(addr); } +#define IOMEM_ERR_PTR(err) (void __iomem *)ERR_PTR(err) + #define __MTRR_ID_BASE 1 int lkpi_arch_phys_wc_add(unsigned long, unsigned long); void lkpi_arch_phys_wc_del(int);