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 03/25] iommu/dma: Cleanup dma-iommu.h
Date: Tue, 30 Apr 2019 06:51:52 -0400 [thread overview]
Message-ID: <20190430105214.24628-4-hch@lst.de> (raw)
In-Reply-To: <20190430105214.24628-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>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
---
include/linux/dma-iommu.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index e760dc5d1fa8..8741637941ca 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -16,9 +16,8 @@
#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>
@@ -74,7 +73,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 +107,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-04-30 10:54 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 10:51 implement generic dma_map_ops for IOMMUs v4 Christoph Hellwig
2019-04-30 10:51 ` [PATCH 01/25] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-05-03 11:33 ` Catalin Marinas
2019-05-07 6:37 ` Christoph Hellwig
2019-05-07 9:05 ` Will Deacon
2019-04-30 10:51 ` [PATCH 02/25] dma-mapping: add a Kconfig symbol to indicated arch_dma_prep_coherent presence Christoph Hellwig
2019-05-03 11:36 ` Catalin Marinas
2019-04-30 10:51 ` Christoph Hellwig [this message]
2019-04-30 10:51 ` [PATCH 04/25] iommu/dma: Remove the flush_page callback Christoph Hellwig
2019-05-03 11:43 ` Catalin Marinas
2019-05-03 11:44 ` Catalin Marinas
2019-04-30 10:51 ` [PATCH 05/25] iommu/dma: Use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-04-30 10:51 ` [PATCH 06/25] iommu/dma: move the arm64 wrappers to common code Christoph Hellwig
2019-05-03 11:45 ` Catalin Marinas
2019-04-30 10:51 ` [PATCH 07/25] iommu/dma: Move __iommu_dma_map Christoph Hellwig
2019-04-30 10:51 ` [PATCH 08/25] iommu/dma: Move domain lookup into __iommu_dma_{map,unmap} Christoph Hellwig
2019-04-30 10:51 ` [PATCH 09/25] iommu/dma: Squash __iommu_dma_{map,unmap}_page helpers Christoph Hellwig
2019-04-30 10:51 ` [PATCH 10/25] iommu/dma: Factor out remapped pages lookup Christoph Hellwig
2019-04-30 10:52 ` [PATCH 11/25] iommu/dma: Refactor the page array remapping allocator Christoph Hellwig
2019-04-30 10:52 ` [PATCH 12/25] iommu/dma: Remove __iommu_dma_free Christoph Hellwig
2019-04-30 10:52 ` [PATCH 13/25] iommu/dma: Refactor iommu_dma_free Christoph Hellwig
2019-04-30 10:52 ` [PATCH 14/25] iommu/dma: Refactor iommu_dma_alloc Christoph Hellwig
2019-04-30 10:52 ` [PATCH 15/25] iommu/dma: Don't remap CMA unnecessarily Christoph Hellwig
2019-04-30 10:52 ` [PATCH 16/25] iommu/dma: Merge the CMA and alloc_pages allocation paths Christoph Hellwig
2019-04-30 10:52 ` [PATCH 17/25] iommu/dma: Split iommu_dma_free Christoph Hellwig
2019-04-30 10:52 ` [PATCH 18/25] iommu/dma: Cleanup variable naming in iommu_dma_alloc Christoph Hellwig
2019-04-30 10:52 ` [PATCH 19/25] iommu/dma: Refactor iommu_dma_alloc, part 2 Christoph Hellwig
2019-04-30 10:52 ` [PATCH 20/25] iommu/dma: Refactor iommu_dma_get_sgtable Christoph Hellwig
2019-04-30 10:52 ` [PATCH 21/25] iommu/dma: Refactor iommu_dma_mmap Christoph Hellwig
2019-04-30 10:52 ` [PATCH 22/25] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-04-30 10:52 ` [PATCH 23/25] iommu/dma: Switch copyright boilerplace to SPDX Christoph Hellwig
2019-04-30 10:52 ` [PATCH 24/25] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-05-03 11:45 ` Catalin Marinas
2019-04-30 10:52 ` [PATCH 25/25] arm64: trim includes " Christoph Hellwig
2019-05-03 11:46 ` Catalin Marinas
2019-05-02 13:22 ` implement generic dma_map_ops for IOMMUs v4 Christoph Hellwig
2019-05-03 11:47 ` Catalin Marinas
2019-05-03 11:59 ` 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=20190430105214.24628-4-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).