From patchwork Mon Feb 7 22:20:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 538941 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 p17MNgnu015627 for ; Mon, 7 Feb 2011 22:23:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752897Ab1BGWXl (ORCPT ); Mon, 7 Feb 2011 17:23:41 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:51703 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242Ab1BGWXk (ORCPT ); Mon, 7 Feb 2011 17:23:40 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 796321A476B; Mon, 7 Feb 2011 23:21:44 +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 09262-02; Mon, 7 Feb 2011 23:21:11 +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 7DEE31A476A; Mon, 7 Feb 2011 23:21:11 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 4/6] ACPI / PM: Call acpi_save_state_mem() right before low-level suspend Date: Mon, 7 Feb 2011 23:20:53 +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: <201102072320.53799.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:23:42 +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 @@ -244,17 +244,10 @@ static int acpi_suspend_enter(suspend_st { acpi_status status = AE_OK; u32 acpi_state = acpi_target_sleep_state; + int error; ACPI_FLUSH_CPU_CACHE(); - /* Do arch specific saving of state. */ - if (acpi_state == ACPI_STATE_S3) { - int error = acpi_save_state_mem(); - - if (error) - return error; - } - switch (acpi_state) { case ACPI_STATE_S1: barrier(); @@ -262,6 +255,9 @@ static int acpi_suspend_enter(suspend_st break; case ACPI_STATE_S3: + error = acpi_save_state_mem(); + if (error) + return error; do_suspend_lowlevel(); pr_info(PREFIX "Low-level resume complete\n"); break;