[Xen-changelog] fix ARCH=i386 build

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1511.1.1, 2005/05/24 00:04:31+01:00, vh249@xxxxxxxxxxxxxxxxxxxxxx

        fix ARCH=i386 build
        
        Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>



 tables.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c 
b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c
--- a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c     2005-05-23 20:03:15 
-04:00
+++ b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c     2005-05-23 20:03:15 
-04:00
@@ -565,6 +565,12 @@
  * 
  * result: sdt_entry[] is initialized
  */
+#if CONFIG_XEN
+#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \
+                                          (rsdp_phys & ~PAGE_MASK))
+#else
+#define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys)
+#endif
 
 int __init
 acpi_table_init (void)
@@ -581,8 +587,7 @@
                return -ENODEV;
        }
 
-       rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) +
-                                          (rsdp_phys & ~PAGE_MASK));
+       rsdp = (struct acpi_table_rsdp *) acpi_rsdp_phys_to_va(rsdp_phys);
        if (!rsdp) {
                printk(KERN_WARNING PREFIX "Unable to map RSDP\n");
                return -ENODEV;

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