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/acpi.h | |
| parent | 26fcaf60fe3861409eb4c455c5c0d0f00f599b08 (diff) | |
| download | linux-stable-976513dbfc1547c7b1822566923058655f0c32fd.tar.gz linux-stable-976513dbfc1547c7b1822566923058655f0c32fd.tar.bz2 linux-stable-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/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 67c91b4418b0..fa7ed6a983d0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -254,6 +254,15 @@ void __init acpi_old_suspend_ordering(void); void __init acpi_nvs_nosave(void); #endif /* CONFIG_PM_SLEEP */ +#ifdef CONFIG_ACPI_SLEEP +int suspend_nvs_register(unsigned long start, unsigned long size); +#else +static inline int suspend_nvs_register(unsigned long a, unsigned long b) +{ + return 0; +} +#endif + struct acpi_osc_context { char *uuid_str; /* uuid string */ int rev; |