3 files changed, 4 insertions, 3 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c8111424dcb8..6729a4992f2b 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
 
         dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
         if (!dpc)
-                return_ACPI_STATUS(AE_NO_MEMORY);
+                return AE_NO_MEMORY;
 
         dpc->function = function;
         dpc->context = context;
@@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
                 status = AE_ERROR;
                 kfree(dpc);
         }
-        return_ACPI_STATUS(status);
+        return status;
 }
 
 acpi_status acpi_os_execute(acpi_execute_type type,
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index 77d73a498bfb..90cc82067c72 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -141,7 +141,6 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags;
 ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
 ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
 ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
-extern u8 acpi_gbl_permanent_mmap;
 
 /* These addresses are calculated from FADT address values */
 
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index c9b903f3625a..be0aa5eb0ba7 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -48,6 +48,8 @@
 #include "actypes.h"
 #include "actbl.h"
 
+extern u8 acpi_gbl_permanent_mmap;
+
 /*
  * Global interfaces
  */