From patchwork Tue Jul 6 18:12:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 110476 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o66IEIWj004944 for ; Tue, 6 Jul 2010 18:14:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753972Ab0GFSN6 (ORCPT ); Tue, 6 Jul 2010 14:13:58 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:56407 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753948Ab0GFSN6 (ORCPT ); Tue, 6 Jul 2010 14:13:58 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 26EA11874EB; Tue, 6 Jul 2010 19:58:57 +0200 (CEST) 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 20861-06; Tue, 6 Jul 2010 19:58:48 +0200 (CEST) Received: from ferrari.localnet (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 B9D7D18405C; Tue, 6 Jul 2010 19:58:48 +0200 (CEST) From: "Rafael J. Wysocki" To: Len Brown Subject: Re: [linux-pm] [PATCH 1/5] ACPI / Sleep: Do not allocate memory for saving NVS in advance Date: Tue, 6 Jul 2010 20:12:34 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rc4; KDE/4.4.4; x86_64; ; ) Cc: linux-pm@lists.linux-foundation.org, ACPI Devel Maling List , Matthew Garrett References: <201007020010.13755.rjw@sisk.pl> <201007020011.22118.rjw@sisk.pl> In-Reply-To: <201007020011.22118.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007062012.34965.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.3 (demeter.kernel.org [140.211.167.41]); Tue, 06 Jul 2010 18:14:18 +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 @@ -145,7 +145,6 @@ static void acpi_pm_finish(void) { u32 acpi_state = acpi_target_sleep_state; - suspend_nvs_free(); acpi_ec_unblock_transactions(); if (acpi_state == ACPI_STATE_S0) @@ -167,6 +166,7 @@ static void acpi_pm_finish(void) */ static void acpi_pm_end(void) { + suspend_nvs_free(); /* * This is necessary in case acpi_pm_finish() is not called during a * failing transition to a sleep state.