From patchwork Thu May 6 17:31:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Starikovskiy X-Patchwork-Id: 97391 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o46HV4rn028092 for ; Thu, 6 May 2010 17:31:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932361Ab0EFRbW (ORCPT ); Thu, 6 May 2010 13:31:22 -0400 Received: from nat.nue.novell.com ([195.135.221.3]:39104 "EHLO nat.nue.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932239Ab0EFRbV (ORCPT ); Thu, 6 May 2010 13:31:21 -0400 Received: from [127.0.1.1] ([149.44.162.75]) by nat.nue.novell.com with ESMTP; Thu, 06 May 2010 19:31:19 +0200 Subject: [PATCH] Subject: [ACPI] Add constraints on usage of ACPI Sleep function To: Len Brown From: Alexey Starikovskiy Cc: Linux-acpi@vger.kernel.org Date: Thu, 06 May 2010 21:31:20 +0400 Message-ID: <20100506173120.16854.60202.stgit@thinkpad> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 06 May 2010 17:31:22 +0000 (UTC) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7594f65..b3451a0 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -438,7 +438,15 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) void acpi_os_sleep(u64 ms) { - schedule_timeout_interruptible(msecs_to_jiffies(ms)); + if (ms > 1000) { + printk(KERN_WARNING FW_BUG + "ACPI: Limit %lld sleep to 1 second\n", ms); + ms = 1000; + } + if (system_state == SYSTEM_RUNNING) + schedule_timeout_interruptible(msecs_to_jiffies(ms)); + else + acpi_os_stall(ms * 1000); } void acpi_os_stall(u32 us)