From: omar.luna@linaro.org (Omar Ramirez Luna)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/9] ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
Date: Wed, 12 Sep 2012 14:45:44 -0500 [thread overview]
Message-ID: <1347479152-588-2-git-send-email-omar.luna@linaro.org> (raw)
In-Reply-To: <1347479152-588-1-git-send-email-omar.luna@linaro.org>
If included without IOMMU_API being selected it will break
compilation:
arch/arm/plat-omap/include/plat/iommu.h:
In function 'dev_to_omap_iommu':
arch/arm/plat-omap/include/plat/iommu.h:148:
error: 'struct dev_archdata' has no member named 'iommu'
This will be seen when hwmod includes iommu.h to get the
structure for attributes. Also needed for tidspbridge
incremental migration to use iommu code.
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Omar Ramirez Luna <omar.luna@linaro.org>
---
arch/arm/plat-omap/include/plat/iommu.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
index 88be3e6..e58d571 100644
--- a/arch/arm/plat-omap/include/plat/iommu.h
+++ b/arch/arm/plat-omap/include/plat/iommu.h
@@ -126,6 +126,7 @@ struct omap_iommu_arch_data {
struct omap_iommu *iommu_dev;
};
+#ifdef CONFIG_IOMMU_API
/**
* dev_to_omap_iommu() - retrieves an omap iommu object from a user device
* @dev: iommu client device
@@ -136,6 +137,7 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
return arch_data->iommu_dev;
}
+#endif
/* IOMMU errors */
#define OMAP_IOMMU_ERR_TLB_MISS (1 << 0)
--
1.7.9.5
next prev parent reply other threads:[~2012-09-12 19:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 19:45 [PATCH v2 0/9] OMAP: iommu: hwmod, reset handling and runtime PM Omar Ramirez Luna
2012-09-12 19:45 ` Omar Ramirez Luna [this message]
2012-09-19 9:35 ` [PATCH v2 1/9] ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected Laurent Pinchart
2012-09-19 21:01 ` Paul Walmsley
2012-09-12 19:45 ` [PATCH v2 2/9] ARM: OMAP3: hwmod data: add mmu data for iva and isp Omar Ramirez Luna
2012-09-19 21:35 ` Paul Walmsley
2012-09-21 0:30 ` Paul Walmsley
2012-09-12 19:45 ` [PATCH v2 3/9] ARM: OMAP4: hwmod data: add mmu hwmod for ipu and dsp Omar Ramirez Luna
2012-09-19 20:59 ` Paul Walmsley
2012-09-19 21:20 ` Cousson, Benoit
2012-09-19 21:31 ` Paul Walmsley
2012-09-12 19:45 ` [PATCH v2 4/9] ARM: OMAP3/4: iommu: migrate to hwmod framework Omar Ramirez Luna
2012-09-12 19:45 ` [PATCH v2 5/9] ARM: OMAP3/4: iommu: adapt to runtime pm Omar Ramirez Luna
2012-09-12 19:45 ` [PATCH v2 6/9] ARM: OMAP: iommu: pm runtime save and restore context Omar Ramirez Luna
2012-09-12 19:45 ` [PATCH v2 7/9] ARM: OMAP: iommu: optimize save and restore routines Omar Ramirez Luna
2012-09-18 18:04 ` Tony Lindgren
2012-09-19 0:53 ` Omar Ramirez Luna
2012-09-12 19:45 ` [PATCH v2 8/9] ARM: OMAP: iommu: add device tree support Omar Ramirez Luna
2012-10-02 21:25 ` Matt Porter
2012-10-03 21:13 ` Omar Ramirez Luna
2012-09-12 19:45 ` [PATCH v2 9/9] arm/dts: OMAP3/4: Add iommu nodes Omar Ramirez Luna
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=1347479152-588-2-git-send-email-omar.luna@linaro.org \
--to=omar.luna@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).