ia64/xen-unstable

changeset 5103:3f1fa7551ce9

bitkeeper revision 1.1520 (429261bcx4ebwegQM8Fpx31tkOS8Dw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-unstable.bk
author vh249@arcadians.cl.cam.ac.uk
date Mon May 23 23:05:32 2005 +0000 (2005-05-23)
parents 18001959ba29 220fa69a6777
children cff6a5c4f4b6 1e4b308becce
files linux-2.6.11-xen-sparse/drivers/acpi/tables.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c	Mon May 23 22:34:38 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c	Mon May 23 23:05:32 2005 +0000
     1.3 @@ -565,6 +565,12 @@ acpi_table_get_sdt (
     1.4   * 
     1.5   * result: sdt_entry[] is initialized
     1.6   */
     1.7 +#if CONFIG_XEN
     1.8 +#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \
     1.9 +					   (rsdp_phys & ~PAGE_MASK))
    1.10 +#else
    1.11 +#define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys)
    1.12 +#endif
    1.13  
    1.14  int __init
    1.15  acpi_table_init (void)
    1.16 @@ -581,8 +587,7 @@ acpi_table_init (void)
    1.17  		return -ENODEV;
    1.18  	}
    1.19  
    1.20 -	rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) +
    1.21 -					   (rsdp_phys & ~PAGE_MASK));
    1.22 +	rsdp = (struct acpi_table_rsdp *) acpi_rsdp_phys_to_va(rsdp_phys);
    1.23  	if (!rsdp) {
    1.24  		printk(KERN_WARNING PREFIX "Unable to map RSDP\n");
    1.25  		return -ENODEV;