diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-12 22:03:20 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 16:11:30 -0500 |
| commit | 6fed05c9c9812b5882bc708f4da4fa8d5df2875c (patch) | |
| tree | a9ad3082384d42b39110141ac85bfdf37bf5338c /include/linux/acpi.h | |
| parent | 6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff) | |
| download | linux-stable-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.tar.gz linux-stable-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.tar.bz2 linux-stable-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.zip | |
ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
The recent rework of the NVS saving/restoring code introduced two
build issues for !CONFIG_ACPI, a warning in drivers/acpi/internal.h
and an error in arch/x86/kernel/e820.c.
Fix them by providing suitable static inline definitions of the
relevant functions.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index fa7ed6a983d0..eb176bb1b15b 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -254,15 +254,6 @@ 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; @@ -361,4 +352,14 @@ static inline int acpi_table_parse(char *id, return -1; } #endif /* !CONFIG_ACPI */ + +#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 + #endif /*_LINUX_ACPI_H*/ |