1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 5cfb7b5cc0b8..12c09fafce9a 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -993,11 +993,11 @@ static 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 if (!strcmp("!Linux", str)) {
+                enable_osi_linux(0);
         } else if (*str == '!') {
                 if (acpi_osi_invalidate(++str) == AE_OK)
                         printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
-        } else if (!strcmp("!Linux", str)) {
-                enable_osi_linux(0);
         } else if (!strcmp("Linux", str)) {
                 enable_osi_linux(1);
         } else if (*osi_additional_string == '\0') {
@@ -1092,7 +1092,7 @@ void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)
 acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
-        *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
+        *cache = kmem_cache_create(name, size, 0, 0, NULL);
         if (*cache == NULL)
                 return AE_ERROR;
         else