[Xen-changelog] [xen master] iommu: fix arm build after e9be34be5

[p***@xen.org]

commit 5e00f02763f66dbbf0c86eee333c798fa8565a19
Author: Wei Liu <***@citrix.com>
AuthorDate: Tue Oct 9 19:58:12 2018 +0100
Commit: Wei Liu <***@citrix.com>
CommitDate: Wed Oct 10 11:26:33 2018 +0100

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 <***@citrix.com>
Reviewed-by: Roger Pau Monné <***@citrix.com>
Acked-by: Jan Beulich <***@suse.com>
---
xen/drivers/passthrough/iommu.c | 2 ++
1 file changed, 2 insertions(+)

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.
--
generated by git-patchbot for /home/xen/git/xen.git#master