diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/acpi/executer | |
parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/executer')
-rw-r--r-- | drivers/acpi/executer/exconfig.c | 1 | ||||
-rw-r--r-- | drivers/acpi/executer/exconvrt.c | 3 | ||||
-rw-r--r-- | drivers/acpi/executer/exmutex.c | 4 | ||||
-rw-r--r-- | drivers/acpi/executer/exsystem.c | 8 |
4 files changed, 9 insertions, 7 deletions
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c index 83fed079a276..c8341fa5fe01 100644 --- a/drivers/acpi/executer/exconfig.c +++ b/drivers/acpi/executer/exconfig.c | |||
@@ -502,7 +502,6 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle) | |||
502 | * (Offset contains the table_id) | 502 | * (Offset contains the table_id) |
503 | */ | 503 | */ |
504 | acpi_ns_delete_namespace_by_owner(table_info->owner_id); | 504 | acpi_ns_delete_namespace_by_owner(table_info->owner_id); |
505 | acpi_ut_release_owner_id(&table_info->owner_id); | ||
506 | 505 | ||
507 | /* Delete the table itself */ | 506 | /* Delete the table itself */ |
508 | 507 | ||
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c index b732e399b1ef..544e81a6a438 100644 --- a/drivers/acpi/executer/exconvrt.c +++ b/drivers/acpi/executer/exconvrt.c | |||
@@ -170,6 +170,9 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc, | |||
170 | return_ACPI_STATUS(AE_NO_MEMORY); | 170 | return_ACPI_STATUS(AE_NO_MEMORY); |
171 | } | 171 | } |
172 | 172 | ||
173 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Converted value: %8.8X%8.8X\n", | ||
174 | ACPI_FORMAT_UINT64(result))); | ||
175 | |||
173 | /* Save the Result */ | 176 | /* Save the Result */ |
174 | 177 | ||
175 | return_desc->integer.value = result; | 178 | return_desc->integer.value = result; |
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c index d8ac2877cf05..3a39c2e8e104 100644 --- a/drivers/acpi/executer/exmutex.c +++ b/drivers/acpi/executer/exmutex.c | |||
@@ -267,9 +267,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, | |||
267 | && (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) { | 267 | && (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) { |
268 | ACPI_ERROR((AE_INFO, | 268 | ACPI_ERROR((AE_INFO, |
269 | "Thread %X cannot release Mutex [%4.4s] acquired by thread %X", | 269 | "Thread %X cannot release Mutex [%4.4s] acquired by thread %X", |
270 | walk_state->thread->thread_id, | 270 | (u32) walk_state->thread->thread_id, |
271 | acpi_ut_get_node_name(obj_desc->mutex.node), | 271 | acpi_ut_get_node_name(obj_desc->mutex.node), |
272 | obj_desc->mutex.owner_thread->thread_id)); | 272 | (u32) obj_desc->mutex.owner_thread->thread_id)); |
273 | return_ACPI_STATUS(AE_AML_NOT_OWNER); | 273 | return_ACPI_STATUS(AE_AML_NOT_OWNER); |
274 | } | 274 | } |
275 | 275 | ||
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c index 6b5d1e6ce94b..28aef3e69ecc 100644 --- a/drivers/acpi/executer/exsystem.c +++ b/drivers/acpi/executer/exsystem.c | |||
@@ -60,7 +60,7 @@ ACPI_MODULE_NAME("exsystem") | |||
60 | * | 60 | * |
61 | * DESCRIPTION: Implements a semaphore wait with a check to see if the | 61 | * DESCRIPTION: Implements a semaphore wait with a check to see if the |
62 | * semaphore is available immediately. If it is not, the | 62 | * semaphore is available immediately. If it is not, the |
63 | * interpreter is released. | 63 | * interpreter is released before waiting. |
64 | * | 64 | * |
65 | ******************************************************************************/ | 65 | ******************************************************************************/ |
66 | acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout) | 66 | acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout) |
@@ -110,9 +110,9 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout) | |||
110 | * | 110 | * |
111 | * RETURN: Status | 111 | * RETURN: Status |
112 | * | 112 | * |
113 | * DESCRIPTION: Implements a semaphore wait with a check to see if the | 113 | * DESCRIPTION: Implements a mutex wait with a check to see if the |
114 | * semaphore is available immediately. If it is not, the | 114 | * mutex is available immediately. If it is not, the |
115 | * interpreter is released. | 115 | * interpreter is released before waiting. |
116 | * | 116 | * |
117 | ******************************************************************************/ | 117 | ******************************************************************************/ |
118 | 118 | ||