From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 7 May 2008 14:53:28 +0000 (+0100)
Subject: merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/iommu: PAGE_SHIFT is 14 on... 
X-Git-Tag: xen-3.3.0-rc1~204
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2caa59cddcd59dc5e3da7977421d63f1be49ce6f;p=qemu-xen-4.3-testing.git

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

diff --git a/hw/iommu.c b/hw/iommu.c
index 440847f2b..4ae509eb9 100644
--- 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)