diff options
| author | Len Brown <len.brown@intel.com> | 2012-01-18 00:18:10 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-18 00:18:10 -0500 |
| commit | 037d76f40430ba1269dc7d1fee22382cd9672997 (patch) | |
| tree | 0a378e88951655aa0042645fbd12b7058be95c3e /include | |
| parent | 5d1f86572685d577b76142b7c61453000e1a5e26 (diff) | |
| parent | 4134b8c8811f23aa8a281db50dcee64dda414736 (diff) | |
| download | linux-037d76f40430ba1269dc7d1fee22382cd9672997.tar.gz linux-037d76f40430ba1269dc7d1fee22382cd9672997.tar.bz2 linux-037d76f40430ba1269dc7d1fee22382cd9672997.zip | |
Merge branch 'apei' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6001b4da39dd..26b75442ff7a 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -306,6 +306,11 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req); extern void acpi_early_init(void); +extern int acpi_nvs_register(__u64 start, __u64 size); + +extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), + void *data); + #else /* !CONFIG_ACPI */ #define acpi_disabled 1 @@ -348,15 +353,18 @@ 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) +static inline int acpi_nvs_register(__u64 start, __u64 size) { return 0; } -#endif + +static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), + void *data) +{ + return 0; +} + +#endif /* !CONFIG_ACPI */ #endif /*_LINUX_ACPI_H*/ |