]> err.no Git - linux-2.6/commit
Introduce CONFIG_SUSPEND for suspend-to-Ram and standby
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 29 Jul 2007 21:27:18 +0000 (23:27 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 29 Jul 2007 23:45:38 +0000 (16:45 -0700)
commit296699de6bdc717189a331ab6bbe90e05c94db06
tree53c847ecc8cce11952502921844052e44ca60d5e
parentb0cb1a19d05b8ea8611a9ef48a17fe417f1832e6
Introduce CONFIG_SUSPEND for suspend-to-Ram and standby

Introduce CONFIG_SUSPEND representing the ability to enter system sleep
states, such as the ACPI S3 state, and allow the user to choose SUSPEND
and HIBERNATION independently of each other.

Make HOTPLUG_CPU be selected automatically if SUSPEND or HIBERNATION has
been chosen and the kernel is intended for SMP systems.

Also, introduce CONFIG_PM_SLEEP which is automatically selected if
CONFIG_SUSPEND or CONFIG_HIBERNATION is set and use it to select the
code needed for both suspend and hibernation.

The top-level power management headers and the ACPI code related to
suspend and hibernation are modified to use the new definitions (the
changes in drivers/acpi/sleep/main.c are, mostly, moving code to reduce
the number of ifdefs).

There are many other files in which CONFIG_PM can be replaced with
CONFIG_PM_SLEEP or even with CONFIG_SUSPEND, but they can be updated in
the future.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 files changed:
drivers/acpi/Kconfig
drivers/acpi/sleep/Makefile
drivers/acpi/sleep/main.c
drivers/acpi/sleep/proc.c
drivers/acpi/sleep/sleep.h
drivers/base/power/Makefile
drivers/base/power/power.h
include/acpi/acpi_bus.h
include/acpi/acpi_drivers.h
include/linux/freezer.h
include/linux/pm.h
include/linux/suspend.h
kernel/power/Kconfig
kernel/power/Makefile
kernel/power/main.c
kernel/power/power.h
mm/page_alloc.c