diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-07 01:43:44 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 00:36:55 -0500 |
| commit | 976513dbfc1547c7b1822566923058655f0c32fd (patch) | |
| tree | 561e658e65a0136691cc9faebbe1ddf17a3429d3 /include/linux/suspend.h | |
| parent | 26fcaf60fe3861409eb4c455c5c0d0f00f599b08 (diff) | |
| download | linux-976513dbfc1547c7b1822566923058655f0c32fd.tar.gz linux-976513dbfc1547c7b1822566923058655f0c32fd.tar.bz2 linux-976513dbfc1547c7b1822566923058655f0c32fd.zip | |
PM / ACPI: Move NVS saving and restoring code to drivers/acpi
The saving of the ACPI NVS area during hibernation and suspend and
restoring it during the subsequent resume is entirely specific to
ACPI, so move it to drivers/acpi and drop the CONFIG_SUSPEND_NVS
configuration option which is redundant.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/suspend.h')
| -rw-r--r-- | include/linux/suspend.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index acb7d911bb0c..0e288e3c37be 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -258,23 +258,6 @@ static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -#ifdef CONFIG_SUSPEND_NVS -extern int suspend_nvs_register(unsigned long start, unsigned long size); -extern int suspend_nvs_alloc(void); -extern void suspend_nvs_free(void); -extern int suspend_nvs_save(void); -extern void suspend_nvs_restore(void); -#else /* CONFIG_SUSPEND_NVS */ -static inline int suspend_nvs_register(unsigned long a, unsigned long b) -{ - return 0; -} -static inline int suspend_nvs_alloc(void) { return 0; } -static inline void suspend_nvs_free(void) {} -static inline int suspend_nvs_save(void) {} -static inline void suspend_nvs_restore(void) {} -#endif /* CONFIG_SUSPEND_NVS */ - #ifdef CONFIG_PM_SLEEP void save_processor_state(void); void restore_processor_state(void); |