git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
acpi
/
executer
/
exutils.c
diff --git
a/drivers/acpi/executer/exutils.c
b/drivers/acpi/executer/exutils.c
index
f73a61a
..
982c8b6
100644
(file)
--- a/
drivers/acpi/executer/exutils.c
+++ b/
drivers/acpi/executer/exutils.c
@@
-87,9
+87,9
@@
acpi_status acpi_ex_enter_interpreter(void)
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_enter_interpreter"
);
+ ACPI_FUNCTION_TRACE(
ex_enter_interpreter
);
- status = acpi_ut_acquire_mutex(ACPI_MTX_
EXECUTE
);
+ status = acpi_ut_acquire_mutex(ACPI_MTX_
INTERPRETER
);
if (ACPI_FAILURE(status)) {
ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
}
if (ACPI_FAILURE(status)) {
ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
}
@@
-123,9
+123,9
@@
void acpi_ex_exit_interpreter(void)
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_exit_interpreter"
);
+ ACPI_FUNCTION_TRACE(
ex_exit_interpreter
);
- status = acpi_ut_release_mutex(ACPI_MTX_
EXECUTE
);
+ status = acpi_ut_release_mutex(ACPI_MTX_
INTERPRETER
);
if (ACPI_FAILURE(status)) {
ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
}
if (ACPI_FAILURE(status)) {
ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
}
@@
-189,11
+189,12
@@
u8 acpi_ex_acquire_global_lock(u32 field_flags)
u8 locked = FALSE;
acpi_status status;
u8 locked = FALSE;
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_acquire_global_lock"
);
+ ACPI_FUNCTION_TRACE(
ex_acquire_global_lock
);
/* Only attempt lock if the always_lock bit is set */
if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
/* Only attempt lock if the always_lock bit is set */
if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
+
/* We should attempt to get the lock, wait forever */
status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
/* We should attempt to get the lock, wait forever */
status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
@@
-225,15
+226,17
@@
void acpi_ex_release_global_lock(u8 locked_by_me)
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_release_global_lock"
);
+ ACPI_FUNCTION_TRACE(
ex_release_global_lock
);
/* Only attempt unlock if the caller locked it */
if (locked_by_me) {
/* Only attempt unlock if the caller locked it */
if (locked_by_me) {
+
/* OK, now release the lock */
status = acpi_ev_release_global_lock();
if (ACPI_FAILURE(status)) {
/* OK, now release the lock */
status = acpi_ev_release_global_lock();
if (ACPI_FAILURE(status)) {
+
/* Report the error, but there isn't much else we can do */
ACPI_EXCEPTION((AE_INFO, status,
/* Report the error, but there isn't much else we can do */
ACPI_EXCEPTION((AE_INFO, status,
@@
-263,7
+266,7
@@
static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
u32 num_digits;
acpi_integer current_value;
u32 num_digits;
acpi_integer current_value;
- ACPI_FUNCTION_TRACE(
"ex_digits_needed"
);
+ ACPI_FUNCTION_TRACE(
ex_digits_needed
);
/* acpi_integer is unsigned, so we don't worry about a '-' prefix */
/* acpi_integer is unsigned, so we don't worry about a '-' prefix */