]> xenbits.xensource.com Git - people/dariof/xen.git/commitdiff
iommu: fix arm build after e9be34be5
authorWei Liu <wei.liu2@citrix.com>
Tue, 9 Oct 2018 18:58:12 +0000 (19:58 +0100)
committerWei Liu <wei.liu2@citrix.com>
Wed, 10 Oct 2018 10:26:33 +0000 (11:26 +0100)
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>
xen/drivers/passthrough/iommu.c

index e03de6e3abbfb9091052898dfbc9ce9eb91e844e..8b438ae4bcb2201cadfdea80bb2ae3fbd6f3e7af 100644 (file)
@@ -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.