diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 22:21:11 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 22:21:11 +0400 |
| commit | 0faf996f4dd02a361158a705afcc31284d732276 (patch) | |
| tree | 9d0907fced6600cdd0d9cef78f532838220157f7 /drivers/acpi/acpica/tbxfload.c | |
| parent | ee360d688c8e37f81c92039f76bebaddbe36befe (diff) | |
| parent | 45c9f78b25ad9ce6cdf259ac4b652e6783adcb23 (diff) | |
| download | linux-0faf996f4dd02a361158a705afcc31284d732276.tar.xz | |
Merge branch 'acpica'
* acpica: (35 commits)
ACPICA: Add __init for ACPICA initializers/finalizers.
ACPICA: Cleanup asmlinkage for ACPICA APIs.
ACPICA: Update acpidump related header file changes.
ACPICA: Update compilation environment settings.
ACPICA: Fix cached object deletion code.
ACPICA: Remove dead AOPOBJ_INVALID check.
ACPICA: Cleanup useless memset invocations.
ACPICA: Fix an ACPI_ALLOCATE_ZEROED() reversal.
ACPICA: Fix wrong object length returned by acpi_ut_get_simple_object_size().
ACPICA: Add new statistics interface.
ACPICA: Update DMAR table definitions.
ACPICA: Update RSDP table definitions.
ACPICA: Update namespace dump code.
ACPICA: Update check for setting the ANOBJ_IS_EXTERNAL flag.
ACPICA: Update default space handlers.
ACPICA: Update version to 20130927.
ACPICA: Update aclinux.h for new OSL override mechanism.
ACPICA: Add support to allow host OS to redefine individual OSL prototypes.
ACPICA: Simplify configuration of global ACPI_REDUCED_HARDWARE macro.
ACPICA: Fix indentation issues for macro invocations.
...
Diffstat (limited to 'drivers/acpi/acpica/tbxfload.c')
| -rw-r--r-- | drivers/acpi/acpica/tbxfload.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index 0ba9e328d5d7..60b5a871833c 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c @@ -41,7 +41,8 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#include <linux/export.h> +#define EXPORT_ACPI_INTERFACES + #include <acpi/acpi.h> #include "accommon.h" #include "acnamesp.h" @@ -65,7 +66,7 @@ static acpi_status acpi_tb_load_namespace(void); * ******************************************************************************/ -acpi_status acpi_load_tables(void) +acpi_status __init acpi_load_tables(void) { acpi_status status; @@ -82,7 +83,7 @@ acpi_status acpi_load_tables(void) return_ACPI_STATUS(status); } -ACPI_EXPORT_SYMBOL(acpi_load_tables) +ACPI_EXPORT_SYMBOL_INIT(acpi_load_tables) /******************************************************************************* * @@ -200,7 +201,7 @@ static acpi_status acpi_tb_load_namespace(void) ACPI_INFO((AE_INFO, "All ACPI Tables successfully acquired")); - unlock_and_exit: +unlock_and_exit: (void)acpi_ut_release_mutex(ACPI_MTX_TABLES); return_ACPI_STATUS(status); } @@ -268,7 +269,7 @@ acpi_status acpi_load_table(struct acpi_table_header *table) acpi_gbl_table_handler_context); } - unlock_and_exit: +unlock_and_exit: (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER); return_ACPI_STATUS(status); } |