From 677fab205a88b6bd085d4cb2cf87664671b2bc12 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sun, 6 May 2007 14:50:50 -0700 Subject: [PATCH] --- yaml --- r: 54271 b: refs/heads/master c: a7ee2e5f5b4c9c72f4390c60ba7ea30306f47188 h: refs/heads/master i: 54269: 52ae0c4f5a1188a78418113d282dcbd96f0c2085 54267: 081fea402e41ef9eeddc02a7cbcf066cc9c23592 54263: 6d1d61186edcd0daa8179ce87a507f1bbb33c0b8 54255: 2434e6a06187d75f45540f683125ab76a0317a00 54239: e3528d2e42e72ce955a2c4c543c29814e803e012 54207: 738a4eb50d4265824913c52b921f0ffea29273f0 54143: fd8ba0b52831a04a38d65d2cdeeca945673aedd4 54015: c905af7772ae3fbc1778e9c572dc01195c6c3a71 53759: 0a2949eb3d4d6500ad38d7f23976117850f5a779 53247: 2f024ad2cf79ba66292b55b78f462e1a38f0045d v: v3 --- [refs] | 2 +- trunk/kernel/power/Kconfig | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6a1b9ed82aec..033541af1985 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ced9b229cfbc76b5db9837b4b256b602d56610 +refs/heads/master: a7ee2e5f5b4c9c72f4390c60ba7ea30306f47188 diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index 51a4dd0f1b74..877721708fa4 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/kernel/power/Kconfig @@ -78,17 +78,22 @@ config PM_SYSFS_DEPRECATED are likely to be bus or driver specific. config SOFTWARE_SUSPEND - bool "Software Suspend" + bool "Software Suspend (Hibernation)" depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) ---help--- - Enable the suspend to disk (STD) functionality. + Enable the suspend to disk (STD) functionality, which is usually + called "hibernation" in user interfaces. STD checkpoints the + system and powers it off; and restores that checkpoint on reboot. You can suspend your machine with 'echo disk > /sys/power/state'. Alternatively, you can use the additional userland tools available from . In principle it does not require ACPI or APM, although for example - ACPI will be used if available. + ACPI will be used for the final steps when it is available. One + of the reasons to use software suspend is that the firmware hooks + for suspend states like suspend-to-RAM (STR) often don't work very + well with Linux. It creates an image which is saved in your active swap. Upon the next boot, pass the 'resume=/dev/swappartition' argument to the kernel to