From a67d84cc4d06d718c0acacf59d0d36c458335fc5 Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Thu, 24 Feb 2011 20:48:56 +0100 Subject: [PATCH] --- yaml --- r: 235153 b: refs/heads/master c: a8b7228cdce9937ebc302a28db8599035e7b3c86 h: refs/heads/master i: 235151: 3f01e20d2364e5afe2d963d70a848662de28a013 v: v3 --- [refs] | 2 +- trunk/Documentation/power/states.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6746e7791a9c..11a27522378f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9659cc0678b954f187290c6e8b247a673c5d37e1 +refs/heads/master: a8b7228cdce9937ebc302a28db8599035e7b3c86 diff --git a/trunk/Documentation/power/states.txt b/trunk/Documentation/power/states.txt index 34800cc521bf..4416b28630df 100644 --- a/trunk/Documentation/power/states.txt +++ b/trunk/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