diff options
| author | Yi Yang <yi.y.yang@intel.com> | 2008-08-04 10:30:09 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:14:36 -0400 |
| commit | b417d40b9a850f12f69aa9d785d2af39c9463bb8 (patch) | |
| tree | 49ab4e4732922c593b416c3cf8deecdbb57c95c2 | |
| parent | a6f30539f31a8129288b0e5640d3eb1174848c15 (diff) | |
| download | linux-3.10-b417d40b9a850f12f69aa9d785d2af39c9463bb8.tar.gz linux-3.10-b417d40b9a850f12f69aa9d785d2af39c9463bb8.tar.bz2 linux-3.10-b417d40b9a850f12f69aa9d785d2af39c9463bb8.zip | |
ACPICA: Return status from global init function
Return status from acpi_ut_init_globals. This is used by both
the kernel subsystem and the utilities such as iASL compiler.
The function could possibly fail when the caches are initialized.
Yang Yi.
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/utilities/utglobal.c | 8 | ||||
| -rw-r--r-- | drivers/acpi/utilities/utxface.c | 7 | ||||
| -rw-r--r-- | include/acpi/acutils.h | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c index a6e71b801d2..248eefc369f 100644 --- a/drivers/acpi/utilities/utglobal.c +++ b/drivers/acpi/utilities/utglobal.c @@ -677,14 +677,14 @@ u8 acpi_ut_valid_object_type(acpi_object_type type) * * PARAMETERS: None * - * RETURN: None + * RETURN: Status * * DESCRIPTION: Init library globals. All globals that require specific * initialization should be initialized here! * ******************************************************************************/ -void acpi_ut_init_globals(void) +acpi_status acpi_ut_init_globals(void) { acpi_status status; u32 i; @@ -695,7 +695,7 @@ void acpi_ut_init_globals(void) status = acpi_ut_create_caches(); if (ACPI_FAILURE(status)) { - return; + return_ACPI_STATUS(status); } /* Mutex locked flags */ @@ -772,7 +772,7 @@ void acpi_ut_init_globals(void) acpi_gbl_display_final_mem_stats = FALSE; #endif - return_VOID; + return_ACPI_STATUS(AE_OK); } ACPI_EXPORT_SYMBOL(acpi_dbg_level) diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c index f8bdadf3c32..c198a4d4058 100644 --- a/drivers/acpi/utilities/utxface.c +++ b/drivers/acpi/utilities/utxface.c @@ -81,7 +81,12 @@ acpi_status __init acpi_initialize_subsystem(void) /* Initialize all globals used by the subsystem */ - acpi_ut_init_globals(); + status = acpi_ut_init_globals(); + if (ACPI_FAILURE(status)) { + ACPI_EXCEPTION((AE_INFO, status, + "During initialization of globals")); + return_ACPI_STATUS(status); + } /* Create the default mutex objects */ diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h index 69f8888771f..10ce81406f9 100644 --- a/include/acpi/acutils.h +++ b/include/acpi/acutils.h @@ -110,7 +110,7 @@ struct acpi_pkg_info { /* * utglobal - Global data structures and procedures */ -void acpi_ut_init_globals(void); +acpi_status acpi_ut_init_globals(void); #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) |