diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-07 00:45:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-07 00:45:27 +0200 |
| commit | 23a75c52bef3ed0b688e45e352ce26069bdfd97f (patch) | |
| tree | d9f0348ad9031f8552f6de067c76a6da1e24b03c /drivers/acpi/osl.c | |
| parent | d48dc067450d84324067f4472dc0b169e9af4454 (diff) | |
| parent | fd0c940522c5c5b281b7a4fe3497fabf74bd8911 (diff) | |
Merge back earlier ACPICA material.
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 6776c599816..9aeae41e22f 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1770,16 +1770,15 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object) } #endif -static int __init acpi_no_auto_ssdt_setup(char *s) +static int __init acpi_no_static_ssdt_setup(char *s) { - printk(KERN_NOTICE PREFIX "SSDT auto-load disabled\n"); + acpi_gbl_disable_ssdt_table_install = TRUE; + pr_info("ACPI: static SSDT installation disabled\n"); - acpi_gbl_disable_ssdt_table_load = TRUE; - - return 1; + return 0; } -__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup); +early_param("acpi_no_static_ssdt", acpi_no_static_ssdt_setup); static int __init acpi_disable_return_repair(char *s) { |