Pull dock into release branch

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

diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 7c38528a7e8336ef1ec3c57b2bc5c7741438281f..ae97812681a3ee7fa9ce448aadc0baaea51f7b39 100644 (file)
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -583,7 +583,10 @@ acpi_ex_create_method(u8 * aml_start,
         * Get the sync_level. If method is serialized, a mutex will be
         * created for this method when it is parsed.
         */
-       if (method_flags & AML_METHOD_SERIALIZED) {
+       if (acpi_gbl_all_methods_serialized) {
+               obj_desc->method.sync_level = 0;
+               obj_desc->method.method_flags |= AML_METHOD_SERIALIZED;
+       } else if (method_flags & AML_METHOD_SERIALIZED) {
                /*
                 * ACPI 1.0: sync_level = 0
                 * ACPI 2.0: sync_level = sync_level in method declaration