ia64/xen-unstable

changeset 14230:aae662fdf53e

xen: Fix ACPI SLIT/SRAT parsing to correctly map highmem.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Mon Mar 05 10:37:01 2007 +0000 (2007-03-05)
parents f5b9ad8acea5
children 939d2b7d4a12
files xen/drivers/acpi/numa.c
line diff
     1.1 --- a/xen/drivers/acpi/numa.c	Mon Mar 05 10:26:45 2007 +0000
     1.2 +++ b/xen/drivers/acpi/numa.c	Mon Mar 05 10:37:01 2007 +0000
     1.3 @@ -22,10 +22,6 @@
     1.4   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     1.5   *
     1.6   */
     1.7 -#if 0
     1.8 -#include <linux/module.h>
     1.9 -#include <linux/kernel.h>
    1.10 -#endif
    1.11  #include <xen/config.h>
    1.12  #include <xen/init.h>
    1.13  #include <xen/types.h>
    1.14 @@ -34,7 +30,6 @@
    1.15  #include <xen/numa.h>
    1.16  #include <acpi/acpi_bus.h>
    1.17  #include <acpi/acmacros.h>
    1.18 -#include <asm/page.h> /* __va() */
    1.19  
    1.20  #define ACPI_NUMA	0x80000000
    1.21  #define _COMPONENT	ACPI_NUMA
    1.22 @@ -106,7 +101,7 @@ static int __init acpi_parse_slit(unsign
    1.23  	if (!phys_addr || !size)
    1.24  		return -EINVAL;
    1.25  
    1.26 -	slit = (struct acpi_table_slit *)__va(phys_addr);
    1.27 +	slit = (struct acpi_table_slit *)__acpi_map_table(phys_addr, size);
    1.28  
    1.29  	/* downcast just for %llu vs %lu for i386/ia64  */
    1.30  	localities = (u32) slit->localities;
    1.31 @@ -159,7 +154,7 @@ static int __init acpi_parse_srat(unsign
    1.32  	if (!phys_addr || !size)
    1.33  		return -EINVAL;
    1.34  
    1.35 -	srat = (struct acpi_table_srat *)__va(phys_addr);
    1.36 +	srat = (struct acpi_table_srat *)__acpi_map_table(phys_addr, size);
    1.37  
    1.38  	return 0;
    1.39  }