From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 04/21] dma-iommu: cleanup dma-iommu.h
Date: Wed, 27 Mar 2019 09:04:31 +0100 [thread overview]
Message-ID: <20190327080448.5500-5-hch@lst.de> (raw)
In-Reply-To: <20190327080448.5500-1-hch@lst.de>
No need for a __KERNEL__ guard outside uapi and add a missing comment
describing the #else cpp statement. Last but not least include
<linux/errno.h> instead of the asm version, which is frowned upon.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/dma-iommu.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index e760dc5d1fa8..3e206f4ee173 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -16,14 +16,14 @@
#ifndef __DMA_IOMMU_H
#define __DMA_IOMMU_H
-#ifdef __KERNEL__
+#include <linux/errno.h>
#include <linux/types.h>
-#include <asm/errno.h>
#ifdef CONFIG_IOMMU_DMA
#include <linux/dma-mapping.h>
#include <linux/iommu.h>
#include <linux/msi.h>
+#include <linux/types.h>
int iommu_dma_init(void);
@@ -74,7 +74,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
-#else
+#else /* CONFIG_IOMMU_DMA */
struct iommu_domain;
struct msi_msg;
@@ -108,5 +108,4 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
}
#endif /* CONFIG_IOMMU_DMA */
-#endif /* __KERNEL__ */
#endif /* __DMA_IOMMU_H */
--
2.20.1
next prev parent reply other threads:[~2019-03-27 8:04 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 8:04 implement generic dma_map_ops for IOMMUs v2 [rebase + resend] Christoph Hellwig
2019-03-27 8:04 ` [PATCH 01/21] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-04-05 17:16 ` Robin Murphy
2019-04-05 17:16 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 02/21] arm64/iommu: improve mmap bounds checking Christoph Hellwig
2019-04-05 17:30 ` Robin Murphy
2019-04-05 17:30 ` Robin Murphy
2019-04-07 6:59 ` Christoph Hellwig
2019-04-07 6:59 ` Christoph Hellwig
2019-04-09 15:12 ` Robin Murphy
2019-04-09 15:12 ` Robin Murphy
2019-04-09 17:09 ` Christoph Hellwig
2019-04-09 17:09 ` Christoph Hellwig
[not found] ` <20190327080448.5500-1-hch-jcswGhMUV9g@public.gmane.org>
2019-03-27 8:04 ` [PATCH 03/21] dma-mapping: add a Kconfig symbol to indicated arch_dma_prep_coherent presence Christoph Hellwig
2019-04-05 17:41 ` Robin Murphy
2019-04-05 17:41 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 07/21] dma-iommu: move the arm64 wrappers to common code Christoph Hellwig
2019-04-09 15:07 ` Robin Murphy
2019-04-09 15:07 ` Robin Murphy
2019-04-09 17:15 ` Christoph Hellwig
2019-04-09 17:15 ` Christoph Hellwig
[not found] ` <67573dd3-72c7-692d-bc1a-7edb49ff9551-5wv7dgnIgG8@public.gmane.org>
2019-04-09 17:23 ` Christoph Hellwig
2019-04-09 17:23 ` Christoph Hellwig
2019-04-09 17:33 ` Robin Murphy
2019-04-09 17:33 ` Robin Murphy
2019-03-27 8:04 ` Christoph Hellwig [this message]
2019-04-05 17:42 ` [PATCH 04/21] dma-iommu: cleanup dma-iommu.h Robin Murphy
2019-04-05 17:42 ` Robin Murphy
2019-04-09 17:10 ` Christoph Hellwig
2019-04-09 17:10 ` Christoph Hellwig
2019-03-27 8:04 ` [PATCH 05/21] dma-iommu: remove the flush_page callback Christoph Hellwig
2019-04-05 17:46 ` Robin Murphy
2019-04-05 17:46 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 06/21] dma-iommu: use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-04-05 18:08 ` Robin Murphy
2019-04-05 18:08 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 08/21] dma-iommu: refactor iommu_dma_mmap Christoph Hellwig
2019-04-09 15:29 ` Robin Murphy
2019-04-09 15:29 ` Robin Murphy
[not found] ` <adf139e2-a595-fa08-e287-f358c06d7e91-5wv7dgnIgG8@public.gmane.org>
2019-04-09 17:25 ` Christoph Hellwig
2019-04-09 17:25 ` Christoph Hellwig
2019-03-27 8:04 ` [PATCH 09/21] dma-iommu: refactor iommu_dma_get_sgtable Christoph Hellwig
2019-04-09 15:49 ` Robin Murphy
2019-04-09 15:49 ` Robin Murphy
2019-04-09 17:26 ` Christoph Hellwig
2019-04-09 17:26 ` Christoph Hellwig
2019-03-27 8:04 ` [PATCH 10/21] dma-iommu: move __iommu_dma_map Christoph Hellwig
2019-04-09 15:54 ` Robin Murphy
2019-04-09 15:54 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 11/21] dma-iommu: refactor page array remap helpers Christoph Hellwig
2019-04-09 16:38 ` Robin Murphy
2019-04-09 16:38 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 12/21] dma-iommu: factor atomic pool allocations into helpers Christoph Hellwig
2019-04-09 17:59 ` Robin Murphy
2019-04-09 17:59 ` Robin Murphy
2019-04-10 6:11 ` Christoph Hellwig
2019-04-10 6:11 ` Christoph Hellwig
2019-04-17 6:33 ` Christoph Hellwig
2019-04-17 6:33 ` Christoph Hellwig
2019-04-17 11:54 ` Robin Murphy
2019-04-17 11:54 ` Robin Murphy
2019-04-18 15:06 ` Robin Murphy
2019-04-18 15:06 ` Robin Murphy
2019-04-18 16:35 ` Christoph Hellwig
2019-04-18 16:35 ` Christoph Hellwig
2019-04-18 16:41 ` Robin Murphy
2019-04-18 16:41 ` Robin Murphy
2019-04-19 9:07 ` Christoph Hellwig
2019-04-19 9:07 ` Christoph Hellwig
2019-04-23 9:48 ` Robin Murphy
2019-04-23 9:48 ` Robin Murphy
2019-04-18 18:15 ` Robin Murphy
2019-04-18 18:15 ` Robin Murphy
2019-04-19 8:23 ` Christoph Hellwig
2019-04-19 8:23 ` Christoph Hellwig
[not found] ` <20190419082348.GA22299-jcswGhMUV9g@public.gmane.org>
2019-04-23 10:01 ` Robin Murphy
2019-04-23 10:01 ` Robin Murphy
2019-04-23 14:52 ` Christoph Hellwig
2019-04-23 14:52 ` Christoph Hellwig
2019-04-29 11:49 ` Christoph Hellwig
2019-04-29 11:49 ` Christoph Hellwig
2019-04-29 12:02 ` Robin Murphy
2019-04-29 12:02 ` Robin Murphy
2019-04-22 18:03 ` Christoph Hellwig
2019-04-22 18:03 ` Christoph Hellwig
2019-03-27 8:04 ` [PATCH 13/21] dma-iommu: factor contiguous " Christoph Hellwig
2019-03-27 8:04 ` [PATCH 14/21] dma-iommu: refactor iommu_dma_free Christoph Hellwig
2019-03-27 8:04 ` [PATCH 15/21] dma-iommu: don't remap contiguous allocations for coherent devices Christoph Hellwig
2019-03-27 8:04 ` [PATCH 16/21] dma-iommu: factor contiguous remapped allocations into helpers Christoph Hellwig
2019-03-27 8:04 ` [PATCH 17/21] dma-iommu: refactor iommu_dma_alloc Christoph Hellwig
2019-03-27 8:04 ` [PATCH 18/21] dma-iommu: don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-03-27 8:04 ` [PATCH 19/21] dma-iommu: switch copyright boilerplace to SPDX Christoph Hellwig
2019-03-27 8:04 ` [PATCH 20/21] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-04-01 6:28 ` Mukesh Ojha
2019-04-01 9:39 ` Robin Murphy
2019-03-27 8:04 ` [PATCH 21/21] arm64: trim includes " Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2019-02-13 18:28 implement generic dma_map_ops for IOMMUs v2 Christoph Hellwig
2019-02-13 18:29 ` [PATCH 04/21] dma-iommu: cleanup dma-iommu.h Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190327080448.5500-5-hch@lst.de \
--to=hch@lst.de \
--cc=catalin.marinas@arm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=thomas.lendacky@amd.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).