summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-05 18:52:59 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-05 18:52:59 +1000
commit2194dc27bd845d69ea169fb95c1536002904967e (patch)
treebccf026151d7d34b972ff93b2186a93d89853d3b
parent9be9be2e9a966fe32c1a443c5197f829ecc3028c (diff)
downloadblackbird-op-linux-2194dc27bd845d69ea169fb95c1536002904967e.tar.gz
blackbird-op-linux-2194dc27bd845d69ea169fb95c1536002904967e.zip
powerpc/eeh: Add missing #ifdef CONFIG_IOMMU_API
Some new functions are exposed for use by the IOMMU code but won't build when CONFIG_IOMMU_API isn't set, so shield them appropriately. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/eeh.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 02a67740b151..604387979402 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -1207,6 +1207,8 @@ out:
}
EXPORT_SYMBOL(eeh_dev_release);
+#ifdef CONFIG_IOMMU_API
+
static int dev_has_iommu_table(struct device *dev, void *data)
{
struct pci_dev *pdev = to_pci_dev(dev);
@@ -1253,6 +1255,8 @@ struct eeh_pe *eeh_iommu_group_to_pe(struct iommu_group *group)
return edev->pe;
}
+#endif /* CONFIG_IOMMU_API */
+
/**
* eeh_pe_set_option - Set options for the indicated PE
* @pe: EEH PE
OpenPOWER on IntegriCloud