From: Julien Grall <julien.grall@linaro.org>
Date: Tue, 28 Apr 2015 14:32:34 +0000 (+0100)
Subject: xen/iommu: arm: Wire iommu DOMCTL for ARM
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3278
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25785da906d7b7daadd61cf34334b139e38dbee0;p=xen.git

xen/iommu: arm: Wire iommu DOMCTL for ARM

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c
index 4600019d64..30453d8702 100644
--- a/xen/arch/arm/domctl.c
+++ b/xen/arch/arm/domctl.c
@@ -109,7 +109,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d,
         return 0;
     }
     default:
-        return subarch_do_domctl(domctl, d, u_domctl);
+    {
+        int rc;
+
+        rc = subarch_do_domctl(domctl, d, u_domctl);
+
+        if ( rc == -ENOSYS )
+            rc = iommu_do_domctl(domctl, d, u_domctl);
+
+        return rc;
+    }
     }
 }