1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 3cc97ba48b36..2e9ce94798c7 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -155,16 +155,15 @@ acpi_ex_system_memory_space_handler(u32 function,
 
                 /* Create a new mapping starting at the address given */
 
-                status = acpi_os_map_memory(address, window_size,
-                                            (void **)&mem_info->
-                                            mapped_logical_address);
-                if (ACPI_FAILURE(status)) {
+                mem_info->mapped_logical_address =
+                    acpi_os_map_memory((acpi_native_uint) address, window_size);
+                if (!mem_info->mapped_logical_address) {
                         ACPI_ERROR((AE_INFO,
                                     "Could not map memory at %8.8X%8.8X, size %X",
                                     ACPI_FORMAT_UINT64(address),
                                     (u32) window_size));
                         mem_info->mapped_length = 0;
-                        return_ACPI_STATUS(status);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 /* Save the physical address and mapping size */
@@ -210,11 +209,10 @@ acpi_ex_system_memory_space_handler(u32 function,
                         *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
                         break;
 
-#if ACPI_MACHINE_WIDTH != 16
                 case 64:
                         *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
                         break;
-#endif
+
                 default:
                         /* bit_width was already validated */
                         break;
@@ -236,11 +234,9 @@ acpi_ex_system_memory_space_handler(u32 function,
                         ACPI_SET32(logical_addr_ptr) = (u32) * value;
                         break;
 
-#if ACPI_MACHINE_WIDTH != 16
                 case 64:
                         ACPI_SET64(logical_addr_ptr) = (u64) * value;
                         break;
-#endif
 
                 default:
                         /* bit_width was already validated */