From patchwork Thu Mar 3 08:57:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 606421 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p23GqbgS020091 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 3 Mar 2011 16:52:58 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p23GoZRW027683; Thu, 3 Mar 2011 08:50:36 -0800 Received: from mail-yx0-f175.google.com (mail-yx0-f175.google.com [209.85.213.175]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p2390StG022121 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) for ; Thu, 3 Mar 2011 01:00:30 -0800 Received: by yxn22 with SMTP id 22so295909yxn.6 for ; Thu, 03 Mar 2011 01:00:28 -0800 (PST) Received: by 10.90.125.11 with SMTP id x11mr1549630agc.193.1299142828261; Thu, 03 Mar 2011 01:00:28 -0800 (PST) Received: from localhost.localdomain (e0109-114-22-24-102.uqwimax.jp [114.22.24.102]) by mx.google.com with ESMTPS id i10sm1236118anh.12.2011.03.03.01.00.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Mar 2011 01:00:26 -0800 (PST) From: Alexandre Courbot To: Randy Dunlap Date: Thu, 3 Mar 2011 17:57:40 +0900 Message-Id: <1299142660-5859-1-git-send-email-gnurou@gmail.com> X-Mailer: git-send-email 1.7.4.1 Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-6.463 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SPF_PASS, OSDL_HEADER_SUBJECT_BRACKETED, PATCH_SUBJECT_OSDL, SUBJECT_FUZZY_TION X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 X-Mailman-Approved-At: Thu, 03 Mar 2011 08:50:34 -0800 Cc: Alexandre Courbot , linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [linux-pm] [PATCH] Documentation/power/states.txt: fix repetition X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Mar 2011 16:52:58 +0000 (UTC) diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt index 34800cc..4416b28 100644 --- a/Documentation/power/states.txt +++ b/Documentation/power/states.txt @@ -62,12 +62,12 @@ setup via another operating system for it to use. Despite the inconvenience, this method requires minimal work by the kernel, since the firmware will also handle restoring memory contents on resume. -For suspend-to-disk, a mechanism called swsusp called 'swsusp' (Swap -Suspend) is used to write memory contents to free swap space. -swsusp has some restrictive requirements, but should work in most -cases. Some, albeit outdated, documentation can be found in -Documentation/power/swsusp.txt. Alternatively, userspace can do most -of the actual suspend to disk work, see userland-swsusp.txt. +For suspend-to-disk, a mechanism called 'swsusp' (Swap Suspend) is used +to write memory contents to free swap space. swsusp has some restrictive +requirements, but should work in most cases. Some, albeit outdated, +documentation can be found in Documentation/power/swsusp.txt. +Alternatively, userspace can do most of the actual suspend to disk work, +see userland-swsusp.txt. Once memory state is written to disk, the system may either enter a low-power state (like ACPI S4), or it may simply power down. Powering