[Xen-changelog] [xen-unstable] ia64: fix the build (again)

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1289303437 0
# Node ID cf7a126298fb8d16c564592bb95d18b7dca0a633
# Parent  7f3ccf376aad340a7a74e0e37d0ee8de2e9298db
ia64: fix the build (again)

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/drivers/passthrough/vtd/ia64/vtd.c |    1 +
 xen/drivers/passthrough/vtd/quirks.c   |    4 ++++
 xen/include/asm-ia64/hvm/vacpi.h       |    4 ----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff -r 7f3ccf376aad -r cf7a126298fb xen/drivers/passthrough/vtd/ia64/vtd.c
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c    Tue Nov 09 11:50:14 2010 +0000
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c    Tue Nov 09 11:50:37 2010 +0000
@@ -27,6 +27,7 @@
 #include <asm/sal.h>
 #include "../iommu.h"
 #include "../dmar.h"
+#include "../extern.h"
 #include "../vtd.h"
 
 
diff -r 7f3ccf376aad -r cf7a126298fb xen/drivers/passthrough/vtd/quirks.c
--- a/xen/drivers/passthrough/vtd/quirks.c      Tue Nov 09 11:50:14 2010 +0000
+++ b/xen/drivers/passthrough/vtd/quirks.c      Tue Nov 09 11:50:37 2010 +0000
@@ -119,8 +119,12 @@ static void map_igd_reg(void)
     igd_reg = (igd_mmio & IGD_BAR_MASK) + 0x2000;
 
     /* ioremap this physical page */
+#if defined(CONFIG_X86)
     set_fixmap_nocache(FIX_IGD_MMIO, igd_reg);
     igd_reg_va = (u8 *)fix_to_virt(FIX_IGD_MMIO);
+#else
+    igd_reg_va = ioremap_nocache(igd_reg, 0x100);
+#endif
 }
 
 /*
diff -r 7f3ccf376aad -r cf7a126298fb xen/include/asm-ia64/hvm/vacpi.h
--- a/xen/include/asm-ia64/hvm/vacpi.h  Tue Nov 09 11:50:14 2010 +0000
+++ b/xen/include/asm-ia64/hvm/vacpi.h  Tue Nov 09 11:50:37 2010 +0000
@@ -24,10 +24,6 @@
 #include <public/arch-ia64/hvm/save.h> /* for struct vacpi_regs */
 #include <public/hvm/ioreq.h>
 
-#define ACPI_PM1A_EVT_BLK_ADDRESS 0x0000000000001f40
-#define ACPI_PM1A_CNT_BLK_ADDRESS (ACPI_PM1A_EVT_BLK_ADDRESS + 0x04)
-#define ACPI_PM_TMR_BLK_ADDRESS   (ACPI_PM1A_EVT_BLK_ADDRESS + 0x08)
-
 #define IS_ACPI_ADDR(X)  ((unsigned long)((X)-ACPI_PM1A_EVT_BLK_ADDRESS)<12)
 
 #define FREQUENCE_PMTIMER  3579545UL   /* Timer should run at 3.579545 MHz */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog