lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPICA: Fix fault if acpi_terminate is called twice

Browse Source 
Fixes a problem with the mechanism that prevents problems if the
acpi_terminate interface is inadvertently called more than once
before the ACPICA code is re-initialized. ACPICA BZ 795.

http://acpica.org/bugzilla/show_bug.cgi?id=795

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bob Moore
2009-07-24 11:25:16 +08:00
committed by Len Brown
parent 53e9387bdd
commit 2f977b36e5
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/acpi/acpica/utinit.c
View File

@@ -99,33 +99,19 @@ static void acpi_ut_terminate(void)
* *
* FUNCTION: acpi_ut_subsystem_shutdown * FUNCTION: acpi_ut_subsystem_shutdown
* *
* PARAMETERS: none * PARAMETERS: None
* *
* RETURN: none * RETURN: None
* *
* DESCRIPTION: Shutdown the various subsystems. Don't delete the mutex * DESCRIPTION: Shutdown the various components. Do not delete the mutex
* objects here -- because the AML debugger may be still running. * objects here, because the AML debugger may be still running.
* *
******************************************************************************/ ******************************************************************************/
void acpi_ut_subsystem_shutdown(void) void acpi_ut_subsystem_shutdown(void)
{ {
ACPI_FUNCTION_TRACE(ut_subsystem_shutdown); ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);
/* Just exit if subsystem is already shutdown */
if (acpi_gbl_shutdown) {
ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
return_VOID;
}
/* Subsystem appears active, go ahead and shut it down */
acpi_gbl_shutdown = TRUE;
acpi_gbl_startup_flags = 0;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
#ifndef ACPI_ASL_COMPILER #ifndef ACPI_ASL_COMPILER
/* Close the acpi_event Handling */ /* Close the acpi_event Handling */

16
drivers/acpi/acpica/utxface.c
View File

@@ -318,7 +318,7 @@ ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
* *
* RETURN: Status * RETURN: Status
* *
* DESCRIPTION: Shutdown the ACPI subsystem. Release all resources. * DESCRIPTION: Shutdown the ACPICA subsystem and release all resources.
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_terminate(void) acpi_status acpi_terminate(void)
@@ -327,6 +327,19 @@ acpi_status acpi_terminate(void)
ACPI_FUNCTION_TRACE(acpi_terminate); ACPI_FUNCTION_TRACE(acpi_terminate);
/* Just exit if subsystem is already shutdown */
if (acpi_gbl_shutdown) {
ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
return_ACPI_STATUS(AE_OK);
}
/* Subsystem appears active, go ahead and shut it down */
acpi_gbl_shutdown = TRUE;
acpi_gbl_startup_flags = 0;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
/* Terminate the AML Debugger if present */ /* Terminate the AML Debugger if present */
ACPI_DEBUGGER_EXEC(acpi_gbl_db_terminate_threads = TRUE); ACPI_DEBUGGER_EXEC(acpi_gbl_db_terminate_threads = TRUE);
@@ -353,6 +366,7 @@ acpi_status acpi_terminate(void)
} }
ACPI_EXPORT_SYMBOL(acpi_terminate) ACPI_EXPORT_SYMBOL(acpi_terminate)
#ifndef ACPI_ASL_COMPILER #ifndef ACPI_ASL_COMPILER
#ifdef ACPI_FUTURE_USAGE #ifdef ACPI_FUTURE_USAGE
/******************************************************************************* /*******************************************************************************