diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:26 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:26 +0200 |
| commit | 08476907abf25315acb4c9a72a0e78bf61456696 (patch) | |
| tree | 2f1c0f34771029458813c3015ef9b02b7333dfde /include/acpi | |
| parent | 0ecfe310f4517d7505599be738158087c165be7c (diff) | |
| parent | 08e1d7c0290aaef6bc6d68be8df753ffec02a6ae (diff) | |
Merge branch 'acpica'
* acpica:
ACPICA: Enable auto-serialization as a default kernel behavior.
ACPICA: Ignore sync_level for methods that have been auto-serialized.
ACPICA: Add additional named objects for the auto-serialize method scan.
ACPICA: Add auto-serialization support for ill-behaved control methods.
ACPICA: Remove global option to serialize all control methods.
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index b0b01b13ea99..44f5e9749601 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -71,7 +71,7 @@ extern u32 acpi_dbg_layer; /* ACPICA runtime options */ -extern u8 acpi_gbl_all_methods_serialized; +extern u8 acpi_gbl_auto_serialize_methods; extern u8 acpi_gbl_copy_dsdt_locally; extern u8 acpi_gbl_create_osi_method; extern u8 acpi_gbl_disable_auto_repair; |