From nobody Sun Dec 24 08:23:07 2023 X-Original-To: dev-commits-src-main@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 4SyYvJ3LKpz54HXP; Sun, 24 Dec 2023 08:23:08 +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 4SyYvJ0zsPz4Xf0; Sun, 24 Dec 2023 08:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406188; 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=WnVeIWS8bAYWbWO5jwdfIM9GAQM/DsMoZ4hgKWXDHhs=; b=AmjSEZlthwy7WA9YL+D0xe+i5NDzUZBS5Rqb19B3HT+IIJSBdVnwdvUDAwPlg+2/JxH20D mHrMlZchabcGPm24CzJgIKU2JyRQBTMUhe2p57dWQNJG2c0G8N2pAZ0B7JvhaFgIA/MsBF LVJpjgx9FqQItliUpbdbiPu9mSRTJ7h7PiITqWToQkcGwxPMHMSVkOMNZH7KIF7YYqwYFE pgG03V4Jn0C21F3FwH+H1VYhcmEG6p4c8xZ+ralOnXqtkZse1oaMN+PQRZ85vd2PPqHxhv CnzgjBF4w8LAqpVBt4ih3NrSLY9UOKrPtcFnQQkpFWHbi/WGX3bf4iNsMiW7Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703406188; a=rsa-sha256; cv=none; b=fNAi5vEwKeQz63q5lBitFI73rDK3k9TMqzhxy/lAyoUloXPVaYycRIgTkI1Zl0zSa5pdP7 pSY8QTxdGbNGjDi7+PvjE/5tifCXs821b9/UnbRFDzXfTLS/EWvTu+BrS3zO+4LnU76zqX ef9miMZ1iwYpAhfXZtj3TcL5P/Dy12BegTXgKzX0p95Wp2vOa630gLTOA3Cfd76vZ9y/e1 pn9Hk/UnT11mna8F1+COhnnbl2f8gf3xedtgm+OB4YnllOmB3tBWlLDjnm2IFXihXrM3b3 Nm8K85RmY5UEaBjhtZZwZlgLHRM2qIhYDQvicrBX0ld3rTz+0RERA+KtRtPlBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703406188; 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=WnVeIWS8bAYWbWO5jwdfIM9GAQM/DsMoZ4hgKWXDHhs=; b=nzhsrgX8wjcoKRT0CQl4Ml94kR7DjTyvSlr50ikDe/K9eXCSR4uYm6ibTQgkkSO2nWFt8R w0uTGifGUAZ2xlyt556RJHxX/ztoBYMm3rag81CfjNjJk00xWzQKiydiw/aNVqOU5itdCF j92Gz1qBTGg6afwEfguyvEc/FmOLc0Nhid5BqHLYlzVaUDdO4oVQJMeJAytUecnX2DqpWr E8ZJPJoOXQygTROL0MFoeHrNJ0FCJfcSI0q6pFcaLzi/BONVYyBWxS86an31TSCiN9MH7l 1hlVHq7VBqv0y4R5eymTAG1GtBOijMx/Ot/r0tKMSfh5C4CZlVCMOTVIH7TCoA== 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 4SyYvH6PqXz5ss; Sun, 24 Dec 2023 08:23:07 +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 3BO8N7Tu087128; Sun, 24 Dec 2023 08:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO8N7Va087125; Sun, 24 Dec 2023 08:23:07 GMT (envelope-from git) Date: Sun, 24 Dec 2023 08:23:07 GMT Message-Id: <202312240823.3BO8N7Va087125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: af787b8e8b80 - main - LinuxKPI: Add IOMEM_ERR_PTR() to linux/io.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: af787b8e8b803dbb2c6bd06629974ba39bd0fb70 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=af787b8e8b803dbb2c6bd06629974ba39bd0fb70 commit af787b8e8b803dbb2c6bd06629974ba39bd0fb70 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 08:19:59 +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 --- 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);