Commit 1b6908e6 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] swsusp & acpi_sleep: configuration issues

This moves CONFIG_SOFTWARE_SUSPEND where it belongs, and makes
ACPI_SLEEP depend on it to prevent compile problems.
parent d7a622f4
...@@ -789,8 +789,6 @@ endmenu ...@@ -789,8 +789,6 @@ endmenu
menu "Power management options (ACPI, APM)" menu "Power management options (ACPI, APM)"
source "drivers/acpi/Kconfig"
config PM config PM
bool "Power Management support" bool "Power Management support"
---help--- ---help---
...@@ -811,6 +809,37 @@ config PM ...@@ -811,6 +809,37 @@ config PM
will issue the hlt instruction if nothing is to be done, thereby will issue the hlt instruction if nothing is to be done, thereby
sending the processor to sleep and saving power. sending the processor to sleep and saving power.
config SOFTWARE_SUSPEND
bool "Software Suspend (EXPERIMENTAL)"
depends on EXPERIMENTAL && PM
---help---
Enable the possibilty of suspendig machine. It doesn't need APM.
You may suspend your machine by 'swsusp' or 'shutdown -z <time>'
(patch for sysvinit needed).
It creates an image which is saved in your active swaps. By the next
booting the, pass 'resume=/path/to/your/swap/file' and kernel will
detect the saved image, restore the memory from
it and then it continues to run as before you've suspended.
If you don't want the previous state to continue use the 'noresume'
kernel option. However note that your partitions will be fsck'd and
you must re-mkswap your swap partitions/files.
Right now you may boot without resuming and then later resume but
in meantime you cannot use those swap partitions/files which were
involved in suspending. Also in this case there is a risk that buffers
on disk won't match with saved ones.
SMP is supported ``as-is''. There's a code for it but doesn't work.
There have been problems reported relating SCSI.
This option is about getting stable. However there is still some
absence of features.
For more information take a look at Documentation/swsusp.txt.
source "drivers/acpi/Kconfig"
config APM config APM
tristate "Advanced Power Management BIOS support" tristate "Advanced Power Management BIOS support"
depends on PM depends on PM
...@@ -1516,35 +1545,6 @@ source "arch/i386/oprofile/Kconfig" ...@@ -1516,35 +1545,6 @@ source "arch/i386/oprofile/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
config SOFTWARE_SUSPEND
bool "Software Suspend (EXPERIMENTAL)"
depends on EXPERIMENTAL && PM
---help---
Enable the possibilty of suspendig machine. It doesn't need APM.
You may suspend your machine by 'swsusp' or 'shutdown -z <time>'
(patch for sysvinit needed).
It creates an image which is saved in your active swaps. By the next
booting the, pass 'resume=/path/to/your/swap/file' and kernel will
detect the saved image, restore the memory from
it and then it continues to run as before you've suspended.
If you don't want the previous state to continue use the 'noresume'
kernel option. However note that your partitions will be fsck'd and
you must re-mkswap your swap partitions/files.
Right now you may boot without resuming and then later resume but
in meantime you cannot use those swap partitions/files which were
involved in suspending. Also in this case there is a risk that buffers
on disk won't match with saved ones.
SMP is supported ``as-is''. There's a code for it but doesn't work.
There have been problems reported relating SCSI.
This option is about getting stable. However there is still some
absence of features.
For more information take a look at Documentation/swsusp.txt.
config DEBUG_KERNEL config DEBUG_KERNEL
bool "Kernel debugging" bool "Kernel debugging"
help help
......
...@@ -58,8 +58,7 @@ config ACPI_BOOT ...@@ -58,8 +58,7 @@ config ACPI_BOOT
config ACPI_SLEEP config ACPI_SLEEP
bool "Sleep States" bool "Sleep States"
depends on X86 && ACPI && !ACPI_HT_ONLY depends on X86 && ACPI && !ACPI_HT_ONLY && SOFTWARE_SUSPEND
default SOFTWARE_SUSPEND
---help--- ---help---
This option adds support for ACPI suspend states. This option adds support for ACPI suspend states.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment