summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2008-12-31 09:23:57 +0800
committerLen Brown <len.brown@intel.com>2008-12-31 01:02:05 -0500
commit889c78be9e8d84ea7f991b9b868e006cdb8e42b0 (patch)
tree07c093a6d3c8e5895eb3cf62ca3f676e3cc4d282
parent9b02d6e198d8249246760a93b3adb8df6ecb5204 (diff)
downloadlinux-3.10-889c78be9e8d84ea7f991b9b868e006cdb8e42b0.tar.gz
linux-3.10-889c78be9e8d84ea7f991b9b868e006cdb8e42b0.tar.bz2
linux-3.10-889c78be9e8d84ea7f991b9b868e006cdb8e42b0.zip
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: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/osl.c4
-rw-r--r--include/acpi/acglobal.h1
-rw-r--r--include/acpi/acpixf.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c8111424dcb..6729a4992f2 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 77d73a498bf..90cc82067c7 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 c9b903f3625..be0aa5eb0ba 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
*/