Commit 889c78be authored by Lin Ming's avatar Lin Ming Committed by Len Brown

ACPI: osl.c: replace return_ACPI_STATUS with return

return_ACPI_STATUS is an internal acpica function, replace it with return.
acpi_gbl_permanent_mmap moved from acglobal.h to acpixf.h for external use
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9b02d6e1
...@@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, ...@@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC); dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
if (!dpc) if (!dpc)
return_ACPI_STATUS(AE_NO_MEMORY); return AE_NO_MEMORY;
dpc->function = function; dpc->function = function;
dpc->context = context; dpc->context = context;
...@@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, ...@@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
status = AE_ERROR; status = AE_ERROR;
kfree(dpc); kfree(dpc);
} }
return_ACPI_STATUS(status); return status;
} }
acpi_status acpi_os_execute(acpi_execute_type type, acpi_status acpi_os_execute(acpi_execute_type type,
......
...@@ -141,7 +141,6 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags; ...@@ -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_internal_rsdt acpi_gbl_root_table_list;
ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS; ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
extern u8 acpi_gbl_permanent_mmap;
/* These addresses are calculated from FADT address values */ /* These addresses are calculated from FADT address values */
......
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#include "actypes.h" #include "actypes.h"
#include "actbl.h" #include "actbl.h"
extern u8 acpi_gbl_permanent_mmap;
/* /*
* Global interfaces * Global interfaces
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment