Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpica / dsmethod.c

diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index a9ffd44c18fe322b0a73b97bbe5c11207464c1ba..81a78ba843112d335613fc55a2d0d2ae39e6bc3f 100644 (file)
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -292,9 +292,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
         * reentered one more time (even if it is the same thread)
         */
        obj_desc->method.thread_count++;
+       acpi_method_count++;
        return_ACPI_STATUS(status);
 
-      cleanup:
+cleanup:
        /* On error, must release the method mutex (if present) */
 
        if (obj_desc->method.mutex) {
@@ -424,7 +425,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 
        return_ACPI_STATUS(status);
 
-      cleanup:
+cleanup:
 
        /* On error, we must terminate the method properly */