Re: [PATCH] Documentation/power/states.txt: fix repetition

From: Rafael J. Wysocki
Date: Thu Mar 03 2011 - 04:37:38 EST


On Thursday, March 03, 2011, Alexandre Courbot wrote:
> Remove repetition of "called swsusp".
>
> Signed-off-by: Alexandre Courbot <gnurou@xxxxxxxxx>

This patch has already been applied to suspend-2.6/linux-next.
Is this a new version?

Rafael


> ---
> Documentation/power/states.txt | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> 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
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/