|
|
![](http://www.xen.org/images/globals/pixel.gif) |
|
|
|
|
|
|
|
xen-changelog
[Xen-changelog] [xen-unstable] xen: Fix ACPI SLIT/SRAT parsing to correc
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1173091021 0
# Node ID aae662fdf53ec1f143316406bad19dc48433d39f
# Parent f5b9ad8acea58d7396f959cbddadf6da8dc7f272
xen: Fix ACPI SLIT/SRAT parsing to correctly map highmem.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/drivers/acpi/numa.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff -r f5b9ad8acea5 -r aae662fdf53e xen/drivers/acpi/numa.c
--- a/xen/drivers/acpi/numa.c Mon Mar 05 10:26:45 2007 +0000
+++ b/xen/drivers/acpi/numa.c Mon Mar 05 10:37:01 2007 +0000
@@ -22,10 +22,6 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
*/
-#if 0
-#include <linux/module.h>
-#include <linux/kernel.h>
-#endif
#include <xen/config.h>
#include <xen/init.h>
#include <xen/types.h>
@@ -34,7 +30,6 @@
#include <xen/numa.h>
#include <acpi/acpi_bus.h>
#include <acpi/acmacros.h>
-#include <asm/page.h> /* __va() */
#define ACPI_NUMA 0x80000000
#define _COMPONENT ACPI_NUMA
@@ -106,7 +101,7 @@ static int __init acpi_parse_slit(unsign
if (!phys_addr || !size)
return -EINVAL;
- slit = (struct acpi_table_slit *)__va(phys_addr);
+ slit = (struct acpi_table_slit *)__acpi_map_table(phys_addr, size);
/* downcast just for %llu vs %lu for i386/ia64 */
localities = (u32) slit->localities;
@@ -159,7 +154,7 @@ static int __init acpi_parse_srat(unsign
if (!phys_addr || !size)
return -EINVAL;
- srat = (struct acpi_table_srat *)__va(phys_addr);
+ srat = (struct acpi_table_srat *)__acpi_map_table(phys_addr, size);
return 0;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
<Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-changelog] [xen-unstable] xen: Fix ACPI SLIT/SRAT parsing to correctly map highmem.,
Xen patchbot-unstable <=
|
|
|
|
|