direct-io.hg

changeset 8404:6e24488a89f7

Remove FIX_RSDP_PAGE. Access RSDP via the 'isamap' of low 1MB.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Dec 20 18:45:29 2005 +0100 (2005-12-20)
parents 68d72ac55fe5
children c259492dfb43
files linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c linux-2.6-xen-sparse/drivers/acpi/tables.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Tue Dec 20 18:34:58 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Tue Dec 20 18:45:29 2005 +0100
     1.3 @@ -660,8 +660,6 @@ acpi_find_rsdp (void)
     1.4  	if (!rsdp_phys)
     1.5  		rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);
     1.6  
     1.7 -	set_fixmap(FIX_ACPI_RSDP_PAGE, rsdp_phys);
     1.8 -
     1.9  	return rsdp_phys;
    1.10  }
    1.11  
     2.1 --- a/linux-2.6-xen-sparse/drivers/acpi/tables.c	Tue Dec 20 18:34:58 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/acpi/tables.c	Tue Dec 20 18:45:29 2005 +0100
     2.3 @@ -566,8 +566,7 @@ acpi_table_get_sdt (
     2.4   * result: sdt_entry[] is initialized
     2.5   */
     2.6  #if defined(CONFIG_XEN_X86) || defined(CONFIG_XEN_X86_64)
     2.7 -#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \
     2.8 -					   (rsdp_phys & ~PAGE_MASK))
     2.9 +#define acpi_rsdp_phys_to_va(rsdp_phys) isa_bus_to_virt(rsdp_phys)
    2.10  #else
    2.11  #define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys)
    2.12  #endif
     3.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Tue Dec 20 18:34:58 2005 +0100
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Tue Dec 20 18:45:29 2005 +0100
     3.3 @@ -80,7 +80,6 @@ enum fixed_addresses {
     3.4  #ifdef CONFIG_ACPI_BOOT
     3.5  	FIX_ACPI_BEGIN,
     3.6  	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
     3.7 -	FIX_ACPI_RSDP_PAGE,
     3.8  #endif
     3.9  #ifdef CONFIG_PCI_MMCONFIG
    3.10  	FIX_PCIE_MCFG,
     4.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h	Tue Dec 20 18:34:58 2005 +0100
     4.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h	Tue Dec 20 18:45:29 2005 +0100
     4.3 @@ -50,7 +50,6 @@ enum fixed_addresses {
     4.4  #ifdef CONFIG_ACPI_BOOT
     4.5  	FIX_ACPI_BEGIN,
     4.6  	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
     4.7 -	FIX_ACPI_RSDP_PAGE,
     4.8  #endif
     4.9  	FIX_SHARED_INFO,
    4.10  	FIX_GNTTAB_BEGIN,