From: Wei Liu <wei.liu2@citrix.com>
Date: Tue, 9 Oct 2018 18:58:12 +0000 (+0100)
Subject: iommu: fix arm build after e9be34be5
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3154
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e00f02763f66dbbf0c86eee333c798fa8565a19;p=xen.git

iommu: fix arm build after e9be34be5

The function iommu_share_p2m_table is used by both ARM and x86 but
hap_enabled macro is x86 only. Put the ASSERT under CONFIG_X86.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index e03de6e3ab..8b438ae4bc 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -505,7 +505,9 @@ int iommu_do_domctl(
 
 void iommu_share_p2m_table(struct domain* d)
 {
+#ifdef CONFIG_X86
     ASSERT(hap_enabled(d));
+#endif
     /*
      * iommu_use_hap_pt(d) cannot be used here because during domain
      * construction need_iommu(d) will always return false here.