Commit 976513db authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 26fcaf60

arch/x86/kernel/e820.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/bootmem.h>

#include <linux/pfn.h>

#include <linux/suspend.h>

#include <linux/acpi.h>

#include <linux/firmware-map.h>

#include <linux/memblock.h>

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ acpi-y += atomicio.o 
# sleep related files

acpi-y				+= wakeup.o

acpi-y				+= sleep.o

acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o

acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o nvs.o





#

drivers/acpi/internal.h

+8 −0
Original line number Diff line number Diff line
@@ -82,8 +82,16 @@ extern int acpi_sleep_init(void); 


#ifdef CONFIG_ACPI_SLEEP

int acpi_sleep_proc_init(void);

int suspend_nvs_alloc(void);

void suspend_nvs_free(void);

int suspend_nvs_save(void);

void suspend_nvs_restore(void);

#else

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 void suspend_nvs_restore(void) {}

#endif



#endif /* _ACPI_INTERNAL_H_ */

kernel/power/nvs.c→drivers/acpi/nvs.c

+0 −0

File moved.

View file

include/linux/acpi.h

+9 −0
Original line number Diff line number Diff line
@@ -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;