From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 5 Aug 2014 08:52:59 +0000 (+1000)
Subject: powerpc/eeh: Add missing #ifdef CONFIG_IOMMU_API
X-Git-Tag: firefly_0821_release~176^2~3459^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2194dc27bd845d69ea169fb95c1536002904967e;p=firefly-linux-kernel-4.4.55.git

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>
---

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