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>
Tento commit je obsažen v:

odevzdal
Linus Torvalds

rodič
b0cb1a19d0
revize
296699de6b
@@ -23,7 +23,7 @@
|
||||
*/
|
||||
|
||||
ACPI_MODULE_NAME("sleep")
|
||||
#ifdef CONFIG_ACPI_PROCFS
|
||||
#ifdef CONFIG_ACPI_PROCFS_SLEEP
|
||||
static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
int i;
|
||||
@@ -76,7 +76,7 @@ acpi_system_write_sleep(struct file *file,
|
||||
Done:
|
||||
return error ? error : count;
|
||||
}
|
||||
#endif /* CONFIG_ACPI_PROCFS */
|
||||
#endif /* CONFIG_ACPI_PROCFS_SLEEP */
|
||||
|
||||
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
|
||||
/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
|
||||
@@ -471,7 +471,7 @@ static const struct file_operations acpi_system_wakeup_device_fops = {
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_ACPI_PROCFS
|
||||
#ifdef CONFIG_ACPI_PROCFS_SLEEP
|
||||
static const struct file_operations acpi_system_sleep_fops = {
|
||||
.open = acpi_system_sleep_open_fs,
|
||||
.read = seq_read,
|
||||
@@ -479,7 +479,7 @@ static const struct file_operations acpi_system_sleep_fops = {
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
#endif /* CONFIG_ACPI_PROCFS */
|
||||
#endif /* CONFIG_ACPI_PROCFS_SLEEP */
|
||||
|
||||
#ifdef HAVE_ACPI_LEGACY_ALARM
|
||||
static const struct file_operations acpi_system_alarm_fops = {
|
||||
@@ -506,7 +506,7 @@ static int __init acpi_sleep_proc_init(void)
|
||||
if (acpi_disabled)
|
||||
return 0;
|
||||
|
||||
#ifdef CONFIG_ACPI_PROCFS
|
||||
#ifdef CONFIG_ACPI_PROCFS_SLEEP
|
||||
/* 'sleep' [R/W] */
|
||||
entry =
|
||||
create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR,
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele