merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/iommu: PAGE_SHIFT is 14 on...

diff --git a/hw/iommu.c b/hw/iommu.c
index 440847f2b2ef4ab85d63c22467228ae221dfdbeb..4ae509eb9ab63f9234580ae318890a799d0c0d7a 100644 (file)
--- a/hw/iommu.c
+++ b/hw/iommu.c
@@ -109,7 +109,11 @@ do { printf("IOMMU: " fmt , ##args); } while (0)
 #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
 #define IOPTE_WAZ           0x00000001 /* Write as zeros */
 
+#if defined(__i386__) || defined(__x86_64__)
 #define PAGE_SHIFT      12
+#elif defined(__ia64__)
+#define PAGE_SHIFT      14
+#endif 
 #define PAGE_SIZE       (1 << PAGE_SHIFT)
 #define PAGE_MASK       (PAGE_SIZE - 1)