summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2009-12-30 15:36:42 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 14:57:11 -0700
commit0c468b435fa14744fc25ad999d357afcba710954 (patch)
treea5e05e8f0091f595224bc321f81c1db6981118e0 /arch
parent637f3674cbecf9bd2073276d16ebf31b8775bf7b (diff)
ACPI: introduce kernel parameter acpi_sleep=sci_force_enable
commit d7f0eea9e431e1b8b0742a74db1a9490730b2a25 upstream. Introduce kernel parameter acpi_sleep=sci_force_enable some laptop requires SCI_EN being set directly on resume, or else they hung somewhere in the resume code path. We already have a blacklist for these laptops but we still need this option, especially when debugging some suspend/resume problems, in case there are systems that need this workaround and are not yet in the blacklist. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/acpi/sleep.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index ca93638ba430..8b8573473903 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -162,6 +162,8 @@ static int __init acpi_sleep_setup(char *str)
#endif
if (strncmp(str, "old_ordering", 12) == 0)
acpi_old_suspend_ordering();
+ if (strncmp(str, "sci_force_enable", 16) == 0)
+ acpi_set_sci_en_on_resume();
str = strchr(str, ',');
if (str != NULL)
str += strspn(str, ", \t");