diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:21 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:21 -0400 |
| commit | 3dd6786f55219f87fd33e153669600d715ca9270 (patch) | |
| tree | 305f8389a93bf86df79f4cf8fb0050b1d6008939 /drivers/acpi/executer/excreate.c | |
| parent | f697b677620d04d8c77841745727de85f7e948b1 (diff) | |
| parent | 88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff) | |
Pull bugzilla-8385 into release branch
Diffstat (limited to 'drivers/acpi/executer/excreate.c')
| -rw-r--r-- | drivers/acpi/executer/excreate.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c index ae97812681a3..7c38528a7e83 100644 --- a/drivers/acpi/executer/excreate.c +++ b/drivers/acpi/executer/excreate.c | |||
| @@ -583,10 +583,7 @@ acpi_ex_create_method(u8 * aml_start, | |||
| 583 | * Get the sync_level. If method is serialized, a mutex will be | 583 | * Get the sync_level. If method is serialized, a mutex will be |
| 584 | * created for this method when it is parsed. | 584 | * created for this method when it is parsed. |
| 585 | */ | 585 | */ |
| 586 | if (acpi_gbl_all_methods_serialized) { | 586 | if (method_flags & AML_METHOD_SERIALIZED) { |
| 587 | obj_desc->method.sync_level = 0; | ||
| 588 | obj_desc->method.method_flags |= AML_METHOD_SERIALIZED; | ||
| 589 | } else if (method_flags & AML_METHOD_SERIALIZED) { | ||
| 590 | /* | 587 | /* |
| 591 | * ACPI 1.0: sync_level = 0 | 588 | * ACPI 1.0: sync_level = 0 |
| 592 | * ACPI 2.0: sync_level = sync_level in method declaration | 589 | * ACPI 2.0: sync_level = sync_level in method declaration |