Index: 2005-12-16/arch/i386/kernel/acpi/boot-xen.c
===================================================================
--- 2005-12-16.orig/arch/i386/kernel/acpi/boot-xen.c	2005-12-22 15:27:25.000000000 +0100
+++ 2005-12-16/arch/i386/kernel/acpi/boot-xen.c	2005-12-23 14:45:02.768071504 +0100
@@ -684,8 +684,6 @@ unsigned long __init acpi_find_rsdp(void
 	if (!rsdp_phys)
 		rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);
 
-	set_fixmap(FIX_ACPI_RSDP_PAGE, rsdp_phys);
-
 	return rsdp_phys;
 }
 
Index: 2005-12-16/drivers/acpi/tables.c
===================================================================
--- 2005-12-16.orig/drivers/acpi/tables.c	2005-12-02 09:27:45.000000000 +0100
+++ 2005-12-16/drivers/acpi/tables.c	2005-12-23 14:49:36.145511816 +0100
@@ -572,9 +572,8 @@ static int __init acpi_table_get_sdt(str
  * 
  * result: sdt_entry[] is initialized
  */
-#if defined(CONFIG_X86_XEN) || defined(CONFIG_X86_64_XEN)
-#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \
-					   (rsdp_phys & ~PAGE_MASK))
+#if defined(CONFIG_XEN) && defined(CONFIG_X86)
+#define acpi_rsdp_phys_to_va(rsdp_phys) isa_bus_to_virt(rsdp_phys)
 #else
 #define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys)
 #endif