summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exsystem.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2010-05-26 11:22:41 +0800
committerLen Brown <len.brown@intel.com>2010-06-12 00:55:17 -0400
commit9cbfa18e8a7b34a32eddbd914a07f085962f50a8 (patch)
tree4ef8f4055af728372b94b1a9fb07b0eff09bea30 /drivers/acpi/acpica/exsystem.c
parentd70326689b70b35527765bd3decbb1229459e928 (diff)
downloadblackbird-op-linux-9cbfa18e8a7b34a32eddbd914a07f085962f50a8.tar.gz
blackbird-op-linux-9cbfa18e8a7b34a32eddbd914a07f085962f50a8.zip
ACPICA: Limit maximum time for Sleep() operator
To prevent accidental deep sleeps, limit the maximum time that Sleep() will sleep. Configurable, default maximum is two seconds. ACPICA bugzilla 854. http://www.acpica.org/bugzilla/show_bug.cgi?id=854 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exsystem.c')
-rw-r--r--drivers/acpi/acpica/exsystem.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index 6d32e09327f1..675aaa91a770 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -201,6 +201,14 @@ acpi_status acpi_ex_system_do_sleep(u64 how_long)
acpi_ex_relinquish_interpreter();
+ /*
+ * For compatibility with other ACPI implementations and to prevent
+ * accidental deep sleeps, limit the sleep time to something reasonable.
+ */
+ if (how_long > ACPI_MAX_SLEEP) {
+ how_long = ACPI_MAX_SLEEP;
+ }
+
acpi_os_sleep(how_long);
/* And now we must get the interpreter again */
OpenPOWER on IntegriCloud