Merge branch 'acpi_enforce_resources' into release

2 files changed, 19 insertions, 3 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 54f21a5c262b..7068d0bc47c5 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -258,6 +258,22 @@ and is between 256 and 4096 characters. It is defined in the file
                         to assume that this machine's pmtimer latches its value
                         and always returns good values.
 
+        acpi_enforce_resources= [ACPI]
+                        { strict | lax | no }
+                        Check for resource conflicts between native drivers
+                        and ACPI OperationRegions (SystemIO and SystemMemory
+                        only). IO ports and memory declared in ACPI might be
+                        used by the ACPI subsystem in arbitrary AML code and
+                        can interfere with legacy drivers.
+                        strict (default): access to resources claimed by ACPI
+                        is denied; legacy drivers trying to access reserved
+                        resources will fail to bind to device using them.
+                        lax: access to resources claimed by ACPI is allowed;
+                        legacy drivers trying to access reserved resources
+                        will bind successfully but a warning message is logged.
+                        no: ACPI OperationRegions are not marked as reserved,
+                        no further checks are performed.
+
         agp=            [AGP]
                         { off | try_unsupported }
                         off: disable AGP support
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 1e35f342957c..f50ca1ea80c3 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1063,9 +1063,9 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
  * in arbitrary AML code and can interfere with legacy drivers.
  * acpi_enforce_resources= can be set to:
  *
- *   - strict           (2)
+ *   - strict (default) (2)
  *     -> further driver trying to access the resources will not load
- *   - lax (default)    (1)
+ *   - lax              (1)
  *     -> further driver trying to access the resources will load, but you
  *     get a system message that something might go wrong...
  *
@@ -1077,7 +1077,7 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
 #define ENFORCE_RESOURCES_LAX    1
 #define ENFORCE_RESOURCES_NO     0
 
-static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_LAX;
+static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_STRICT;
 
 static int __init acpi_enforce_resources_setup(char *str)
 {