1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6ab2c3505520..e8baa408faef 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -140,7 +140,8 @@ static struct osi_linux {
         unsigned int    enable:1;
         unsigned int    dmi:1;
         unsigned int    cmdline:1;
-} osi_linux = {0, 0, 0};
+        unsigned int    default_disabling:1;
+} osi_linux = {0, 0, 0, 0};
 
 static u32 acpi_osi_handler(acpi_string interface, u32 supported)
 {
@@ -1376,6 +1377,10 @@ void __init acpi_osi_setup(char *str)
 
         if (*str == '!') {
                 str++;
+                if (*str == '\0') {
+                        osi_linux.default_disabling = 1;
+                        return;
+                }
                 enable = false;
         }
 
@@ -1441,6 +1446,13 @@ static void __init acpi_osi_setup_late(void)
         int i;
         acpi_status status;
 
+        if (osi_linux.default_disabling) {
+                status = acpi_update_interfaces(ACPI_DISABLE_ALL_VENDOR_STRINGS);
+
+                if (ACPI_SUCCESS(status))
+                        printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors\n");
+        }
+
         for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) {
                 osi = &osi_setup_entries[i];
                 str = osi->string;