[Xen-changelog] Remove FIX_RSDP_PAGE. Access RSDP via the 'isamap' of low 1MB.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 6e24488a89f7eade3857d1bc11fcc3e24857dc59
# Parent  68d72ac55fe5781a5f6019ee6f89e61e05536218
Remove FIX_RSDP_PAGE. Access RSDP via the 'isamap' of low 1MB.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 68d72ac55fe5 -r 6e24488a89f7 
linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c     Tue Dec 20 
17:34:58 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c     Tue Dec 20 
17:45:29 2005
@@ -659,8 +659,6 @@
        rsdp_phys = acpi_scan_rsdp (0, 0x400);
        if (!rsdp_phys)
                rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);
-
-       set_fixmap(FIX_ACPI_RSDP_PAGE, rsdp_phys);
 
        return rsdp_phys;
 }
diff -r 68d72ac55fe5 -r 6e24488a89f7 linux-2.6-xen-sparse/drivers/acpi/tables.c
--- a/linux-2.6-xen-sparse/drivers/acpi/tables.c        Tue Dec 20 17:34:58 2005
+++ b/linux-2.6-xen-sparse/drivers/acpi/tables.c        Tue Dec 20 17:45:29 2005
@@ -566,8 +566,7 @@
  * result: sdt_entry[] is initialized
  */
 #if defined(CONFIG_XEN_X86) || defined(CONFIG_XEN_X86_64)
-#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \
-                                          (rsdp_phys & ~PAGE_MASK))
+#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
diff -r 68d72ac55fe5 -r 6e24488a89f7 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h    Tue Dec 20 
17:34:58 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h    Tue Dec 20 
17:45:29 2005
@@ -80,7 +80,6 @@
 #ifdef CONFIG_ACPI_BOOT
        FIX_ACPI_BEGIN,
        FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
-       FIX_ACPI_RSDP_PAGE,
 #endif
 #ifdef CONFIG_PCI_MMCONFIG
        FIX_PCIE_MCFG,
diff -r 68d72ac55fe5 -r 6e24488a89f7 
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h  Tue Dec 20 
17:34:58 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h  Tue Dec 20 
17:45:29 2005
@@ -50,7 +50,6 @@
 #ifdef CONFIG_ACPI_BOOT
        FIX_ACPI_BEGIN,
        FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
-       FIX_ACPI_RSDP_PAGE,
 #endif
        FIX_SHARED_INFO,
        FIX_GNTTAB_BEGIN,

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