mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-23 23:21:46 +00:00
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>
This commit is contained in:
parent
b0cb1a19d0
commit
296699de6b
17 changed files with 164 additions and 86 deletions
|
@ -165,6 +165,7 @@ struct pm_ops {
|
|||
int (*finish)(suspend_state_t state);
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SUSPEND
|
||||
extern struct pm_ops *pm_ops;
|
||||
|
||||
/**
|
||||
|
@ -193,6 +194,12 @@ extern void arch_suspend_disable_irqs(void);
|
|||
extern void arch_suspend_enable_irqs(void);
|
||||
|
||||
extern int pm_suspend(suspend_state_t state);
|
||||
#else /* !CONFIG_SUSPEND */
|
||||
#define suspend_valid_only_mem NULL
|
||||
|
||||
static inline void pm_set_ops(struct pm_ops *pm_ops) {}
|
||||
static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
|
||||
#endif /* !CONFIG_SUSPEND */
|
||||
|
||||
/*
|
||||
* Device power management
|
||||
|
@ -266,7 +273,7 @@ typedef struct pm_message {
|
|||
struct dev_pm_info {
|
||||
pm_message_t power_state;
|
||||
unsigned can_wakeup:1;
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
unsigned should_wakeup:1;
|
||||
struct list_head entry;
|
||||
#endif
|
||||
|
@ -276,7 +283,7 @@ extern int device_power_down(pm_message_t state);
|
|||
extern void device_power_up(void);
|
||||
extern void device_resume(void);
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
extern int device_suspend(pm_message_t state);
|
||||
extern int device_prepare_suspend(pm_message_t state);
|
||||
|
||||
|
@ -306,7 +313,7 @@ static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#else /* !CONFIG_PM */
|
||||
#else /* !CONFIG_PM_SLEEP */
|
||||
|
||||
static inline int device_suspend(pm_message_t state)
|
||||
{
|
||||
|
@ -323,7 +330,7 @@ static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* !CONFIG_PM_SLEEP */
|
||||
|
||||
/* changes to device_may_wakeup take effect on the next pm state change.
|
||||
* by default, devices should wakeup if they can.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue