[ACPI] add boot parameters "acpi_osi=" and "acpi_serialize"

  acpi_osi= will disable the _OSI method -- which by default
	tells the BIOS to behave as if Windows is the OS.
  acpi_serialize is for debugging AE_ALREADY_EXISTS failures

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e1325db4ec9004e168775f82bc2c322c0e6adbd1..8d3723dfc12823ec949c8598843bb7a317899672 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -116,6 +116,10 @@ running once the system is up.
        acpi_irq_isa=   [HW,ACPI] If irq_balance, Mark listed IRQs used by ISA
                        Format: <irq>,<irq>...
 
+       acpi_osi=       [HW,ACPI] empty param disables _OSI
+
+       acpi_serialize  [HW,ACPI] force serialization of AML methods
+
        ad1816=         [HW,OSS]
                        Format: <io>,<irq>,<dma>,<dma2>
                        See also Documentation/sound/oss/AD1816.

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 8f506d258b8428642ee237a89d8e4d4dc6e3f318..6ec770c0be88c62430c3a05e5460de8f33989672 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1012,3 +1012,39 @@ acpi_os_name_setup(char *str)
 }
 
 __setup("acpi_os_name=", acpi_os_name_setup);
+
+/*
+ * _OSI control
+ * empty string disables _OSI
+ * TBD additional string adds to _OSI
+ */
+int __init
+acpi_osi_setup(char *str)
+{
+       if (str == NULL || *str == '\0') {
+               printk(KERN_INFO PREFIX "_OSI method disabled\n");
+               acpi_gbl_create_osi_method = FALSE;
+       } else
+       {
+               /* TBD */
+               printk(KERN_ERR PREFIX "_OSI additional string ignored -- %s\n", str);
+       }
+
+       return 1;
+}
+
+__setup("acpi_osi=", acpi_osi_setup);
+
+/* enable serialization to combat AE_ALREADY_EXISTS errors */
+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);
+