From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 4 May 2010 11:54:29 +0000 (+0100)
Subject: VT-d: Fix ia64 build for 20974:3b475d9ed6b5
X-Git-Tag: 3.4.3-rc6~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8dc6d3d356d3f3323678243ac987442c9de61b22;p=people%2Fvhanquez%2Fxen.git

VT-d: Fix ia64 build for 20974:3b475d9ed6b5

This patch fixes the following error on ia64:
  iommu.c: In function 'init_vtd_hw':
  iommu.c:1831: error: 'nr_ioapics' undeclared (first use in this
  function)

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
xen-unstable changeset:   20980:d9db3684f292
xen-unstable date:        Thu Feb 25 11:54:19 2010 +0000
---

diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 7906a3779..18bb182d7 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -135,6 +135,10 @@ void iommu_flush_cache_page(void *addr, unsigned long npages)
     __iommu_flush_cache(addr, PAGE_SIZE_4K * npages);
 }
 
+#ifdef __ia64__
+#define nr_ioapics              iosapic_get_nr_iosapics()
+#endif
+
 int nr_iommus;
 /* context entry handling */
 static u64 bus_to_context_maddr(struct iommu *iommu, u8 bus)