Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpica / exregion.c

diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 0fe188e238efaef41b757608a876a6f2b34631e8..f6c2f5499935c7dffc1c53655b7f1f45da0a7073 100644 (file)
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -165,8 +165,8 @@ acpi_ex_system_memory_space_handler(u32 function,
                 * one page, which is similar to the original code that used a 4k
                 * maximum window.
                 */
-               page_boundary_map_length =
-                   ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address;
+               page_boundary_map_length = (acpi_size)
+                   (ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address);
                if (page_boundary_map_length == 0) {
                        page_boundary_map_length = ACPI_DEFAULT_PAGE_SIZE;
                }
@@ -177,12 +177,13 @@ acpi_ex_system_memory_space_handler(u32 function,
 
                /* Create a new mapping starting at the address given */
 
-               mem_info->mapped_logical_address = acpi_os_map_memory((acpi_physical_address) address, map_length);
+               mem_info->mapped_logical_address =
+                   acpi_os_map_memory(address, map_length);
                if (!mem_info->mapped_logical_address) {
                        ACPI_ERROR((AE_INFO,
                                    "Could not map memory at 0x%8.8X%8.8X, size %u",
-                                   ACPI_FORMAT_NATIVE_UINT(address),
-                                   (u32) map_length));
+                                   ACPI_FORMAT_UINT64(address),
+                                   (u32)map_length));
                        mem_info->mapped_length = 0;
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
@@ -202,8 +203,7 @@ acpi_ex_system_memory_space_handler(u32 function,
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "System-Memory (width %u) R/W %u Address=%8.8X%8.8X\n",
-                         bit_width, function,
-                         ACPI_FORMAT_NATIVE_UINT(address)));
+                         bit_width, function, ACPI_FORMAT_UINT64(address)));
 
        /*
         * Perform the memory read or write
@@ -318,8 +318,7 @@ acpi_ex_system_io_space_handler(u32 function,
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "System-IO (width %u) R/W %u Address=%8.8X%8.8X\n",
-                         bit_width, function,
-                         ACPI_FORMAT_NATIVE_UINT(address)));
+                         bit_width, function, ACPI_FORMAT_UINT64(address)));
 
        /* Decode the function parameter */