Pull dock into release branch

[linux-2.6] / drivers / acpi / executer / exutils.c

diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 8543d1a0ed31865be9c7cdbc4000d746cac82e26..aea461f3a48cc02ab7269c8e7e7e9807657edefc 100644 (file)
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,9 +87,9 @@ acpi_status acpi_ex_enter_interpreter(void)
 {
        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"));
        }
@@ -123,9 +123,9 @@ void acpi_ex_exit_interpreter(void)
 {
        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"));
        }
@@ -189,7 +189,7 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
        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 */
 
@@ -226,7 +226,7 @@ void acpi_ex_release_global_lock(u8 locked_by_me)
 {
        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 */
 
@@ -266,7 +266,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
        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 */