X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Facpi%2Fosl.c;h=b7af3b758f32eabe1f5481f38d82e0223e00eea5;hb=e2b8ddcc6b3fbb860e15c5d52455735e128326aa;hp=fc1aa7909690c3ef148930a4a96080d2bcaaa155;hpb=4293242db153512dcfc7e7af9af683e5b97dd4ce;p=mirror_ubuntu-artful-kernel.git

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index fc1aa7909690..b7af3b758f32 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1539,18 +1539,6 @@ 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)
-{
-	printk(KERN_INFO PREFIX "serialize enabled\n");
-
-	acpi_gbl_all_methods_serialized = TRUE;
-
-	return 1;
-}
-
-__setup("acpi_serialize", acpi_serialize_setup);
-
 /* Check of resource interference between native drivers and ACPI
  * OperationRegions (SystemIO and System Memory only).
  * IO ports and memory declared in ACPI might be used by the ACPI subsystem
@@ -1780,6 +1768,17 @@ static int __init acpi_no_auto_ssdt_setup(char *s)
 
 __setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
 
+static int __init acpi_disable_return_repair(char *s)
+{
+	printk(KERN_NOTICE PREFIX
+	       "ACPI: Predefined validation mechanism disabled\n");
+	acpi_gbl_disable_auto_repair = TRUE;
+
+	return 1;
+}
+
+__setup("acpica_no_return_repair", acpi_disable_return_repair);
+
 acpi_status __init acpi_os_initialize(void)
 {
 	acpi_os_map_generic_address(&acpi_gbl_FADT.xpm1a_event_block);