diff options
| author | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-05-23 23:04:31 +0000 |
|---|---|---|
| committer | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-05-23 23:04:31 +0000 |
| commit | 9ee20980495df01ceebcf58d6a419b8d1f015b09 (patch) | |
| tree | 206a7513b06ba3e49f114a96a8d4e4cedf6c1c6f /linux-2.6.11-xen-sparse | |
| parent | fa16d770580a3be150f15049bcf868bb36465f83 (diff) | |
| download | xen-9ee20980495df01ceebcf58d6a419b8d1f015b09.tar.gz xen-9ee20980495df01ceebcf58d6a419b8d1f015b09.tar.bz2 xen-9ee20980495df01ceebcf58d6a419b8d1f015b09.zip | |
bitkeeper revision 1.1511.1.1 (4292617fUY_QU9fABo1c9En_PEDHQA)
fix ARCH=i386 build
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
Diffstat (limited to 'linux-2.6.11-xen-sparse')
| -rw-r--r-- | linux-2.6.11-xen-sparse/drivers/acpi/tables.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c index 79e956b832..745fcec789 100644 --- a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c +++ b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c @@ -565,6 +565,12 @@ acpi_table_get_sdt ( * * 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 @@ acpi_table_init (void) 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; |