Merge branch 'apei' into release

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / apei / apei-base.c

diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 1d3656f6919f4b7543acf14338dd0954438fd4e7..5577762daee1d7d22a8dbf49a27cf02ead2e54a4 100644 (file)
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -621,7 +621,7 @@ int apei_read(u64 *val, struct acpi_generic_address *reg)
        *val = 0;
        switch(reg->space_id) {
        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-               status = acpi_os_read_memory64((acpi_physical_address) address,
+               status = acpi_os_read_memory((acpi_physical_address) address,
                                               val, access_bit_width);
                if (ACPI_FAILURE(status))
                        return -EIO;
@@ -654,7 +654,7 @@ int apei_write(u64 val, struct acpi_generic_address *reg)
 
        switch (reg->space_id) {
        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-               status = acpi_os_write_memory64((acpi_physical_address) address,
+               status = acpi_os_write_memory((acpi_physical_address) address,
                                                val, access_bit_width);
                if (ACPI_FAILURE(status))
                        return -EIO;