diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 20:09:26 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 20:09:26 (GMT) |
| commit | 08476907abf25315acb4c9a72a0e78bf61456696 (patch) | |
| tree | 2f1c0f34771029458813c3015ef9b02b7333dfde /drivers/acpi/osl.c | |
| parent | 0ecfe310f4517d7505599be738158087c165be7c (diff) | |
| parent | 08e1d7c0290aaef6bc6d68be8df753ffec02a6ae (diff) | |
| download | linux-08476907abf25315acb4c9a72a0e78bf61456696.tar.xz | |
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 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 27f84af..f7fd72a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1537,17 +1537,21 @@ static int __init osi_setup(char *str) __setup("acpi_osi=", osi_setup); -/* enable serialization to combat AE_ALREADY_EXISTS errors */ -static int __init acpi_serialize_setup(char *str) +/* + * Disable the auto-serialization of named objects creation methods. + * + * This feature is enabled by default. It marks the AML control methods + * that contain the opcodes to create named objects as "Serialized". + */ +static int __init acpi_no_auto_serialize_setup(char *str) { - printk(KERN_INFO PREFIX "serialize enabled\n"); - - acpi_gbl_all_methods_serialized = TRUE; + acpi_gbl_auto_serialize_methods = FALSE; + pr_info("ACPI: auto-serialization disabled\n"); return 1; } -__setup("acpi_serialize", acpi_serialize_setup); +__setup("acpi_no_auto_serialize", acpi_no_auto_serialize_setup); /* Check of resource interference between native drivers and ACPI * OperationRegions (SystemIO and System Memory only). |