Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4263d9a3 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'suspend-ioremap-cache' into release

parents eab001bf 6fed05c9

drivers/acpi/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void suspend_nvs_restore(void); 
static inline int acpi_sleep_proc_init(void) { 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 int suspend_nvs_save(void) { return 0; }

static inline void suspend_nvs_restore(void) {}

#endif

include/linux/acpi.h

+10 −9
Original line number Diff line number Diff line
@@ -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*/