Merge branch 'suspend-ioremap-cache' into release
This commit is contained in:
commit
4263d9a3ae
2 changed files with 11 additions and 10 deletions
|
@ -91,7 +91,7 @@ void suspend_nvs_restore(void);
|
||||||
static inline int acpi_sleep_proc_init(void) { return 0; }
|
static inline int acpi_sleep_proc_init(void) { return 0; }
|
||||||
static inline int suspend_nvs_alloc(void) { return 0; }
|
static inline int suspend_nvs_alloc(void) { return 0; }
|
||||||
static inline void suspend_nvs_free(void) {}
|
static inline void suspend_nvs_free(void) {}
|
||||||
static inline int suspend_nvs_save(void) {}
|
static inline int suspend_nvs_save(void) { return 0; }
|
||||||
static inline void suspend_nvs_restore(void) {}
|
static inline void suspend_nvs_restore(void) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -254,15 +254,6 @@ void __init acpi_old_suspend_ordering(void);
|
||||||
void __init acpi_nvs_nosave(void);
|
void __init acpi_nvs_nosave(void);
|
||||||
#endif /* CONFIG_PM_SLEEP */
|
#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 {
|
struct acpi_osc_context {
|
||||||
char *uuid_str; /* uuid string */
|
char *uuid_str; /* uuid string */
|
||||||
int rev;
|
int rev;
|
||||||
|
@ -361,4 +352,14 @@ static inline int acpi_table_parse(char *id,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
#endif /* !CONFIG_ACPI */
|
#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*/
|
#endif /*_LINUX_ACPI_H*/
|
||||||
|
|
Loading…
Reference in a new issue