[Xen-changelog] [xen stable-4.2] Revert "ACPI/ERST: fix table mapping"

[patchbot@xxxxxxx]

commit 3eeb55368557548b1f5cd641af40292bd44fd766
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Jun 4 15:36:25 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Jun 4 15:36:25 2014 +0200

    Revert "ACPI/ERST: fix table mapping"
    
    This reverts commit 45ce6fb083335abf82f5b7d301bcc91261c94925
    (missing 32-bit code).
---
 xen/drivers/acpi/apei/erst.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/xen/drivers/acpi/apei/erst.c b/xen/drivers/acpi/apei/erst.c
index bf8d3de..71db9fa 100644
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -32,7 +32,6 @@
 #include <xen/string.h>
 #include <xen/types.h>
 #include <xen/spinlock.h>
-#include <xen/mm.h>
 #include <xen/cper.h>
 #include <asm/fixmap.h>
 #include <asm/io.h>
@@ -792,27 +791,21 @@ int __init erst_init(void)
 {
        int rc = 0;
        acpi_status status;
-       acpi_physical_address erst_addr;
-       acpi_native_uint erst_len;
        struct apei_exec_context ctx;
 
        if (acpi_disabled)
                return -ENODEV;
 
-       status = acpi_get_table_phys(ACPI_SIG_ERST, 0, &erst_addr, &erst_len);
+       status = acpi_get_table(ACPI_SIG_ERST, 0,
+                               (struct acpi_table_header **)&erst_tab);
        if (status == AE_NOT_FOUND) {
                printk(KERN_INFO "ERST table was not found\n");
                return -ENODEV;
-       }
-       if (ACPI_FAILURE(status)) {
+       } else if (ACPI_FAILURE(status)) {
                const char *msg = acpi_format_exception(status);
                printk(KERN_WARNING "Failed to get ERST table: %s\n", msg);
                return -EINVAL;
        }
-       map_pages_to_xen((unsigned long)__va(erst_addr), PFN_DOWN(erst_addr),
-                        PFN_UP(erst_addr + erst_len) - PFN_DOWN(erst_addr),
-                        PAGE_HYPERVISOR);
-       erst_tab = __va(erst_addr);
 
        rc = erst_check_table(erst_tab);
        if (rc) {
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

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