From patchwork Mon Feb 7 22:22:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 538971 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p17MOPgk016033 for ; Mon, 7 Feb 2011 22:24:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754875Ab1BGWXq (ORCPT ); Mon, 7 Feb 2011 17:23:46 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:51705 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753501Ab1BGWXl (ORCPT ); Mon, 7 Feb 2011 17:23:41 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 4C16F1A3BF2; Mon, 7 Feb 2011 23:21:58 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 09190-04; Mon, 7 Feb 2011 23:21:40 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id C7EAB1A47E6; Mon, 7 Feb 2011 23:21:11 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 6/6] ACPI / PM: Do not switch interrupts off/on in acpi_hibernation_enter() Date: Mon, 7 Feb 2011 23:22:46 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc3+; KDE/4.4.4; x86_64; ; ) Cc: LKML , ACPI Devel Mailing List , Linux PM mailing list , Ingo Molnar References: <201102072316.41270.rjw@sisk.pl> In-Reply-To: <201102072316.41270.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201102072322.47041.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 07 Feb 2011 22:24:25 +0000 (UTC) Index: linux-2.6/drivers/acpi/sleep.c =================================================================== --- linux-2.6.orig/drivers/acpi/sleep.c +++ linux-2.6/drivers/acpi/sleep.c @@ -457,16 +457,13 @@ static int acpi_hibernation_begin(void) static int acpi_hibernation_enter(void) { acpi_status status = AE_OK; - unsigned long flags = 0; ACPI_FLUSH_CPU_CACHE(); - local_irq_save(flags); /* This shouldn't return. If it returns, we have a problem */ status = acpi_enter_sleep_state(ACPI_STATE_S4); /* Reprogram control registers and execute _BFS */ acpi_leave_sleep_state_prep(ACPI_STATE_S4); - local_irq_restore(flags); return ACPI_SUCCESS(status) ? 0 : -EFAULT; }