diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-27 18:11:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-27 18:11:38 +0200 |
| commit | c9b77a4070a60762aee048e3c353d72fb990f940 (patch) | |
| tree | 7820cae684404d2bd26814a327f0e2809724dd33 /drivers/acpi/osl.c | |
| parent | 85dbd5801f62b66e2aa7826aaefcaebead44c8a6 (diff) | |
| parent | bc381eebd4b246d6cc29d97ab34d2c54ecc40a87 (diff) | |
Merge back earlier ACPICA material.
Conflicts:
drivers/acpi/acpica/acglobal.h
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) { |