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

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

x86 hibernate: Mark ACPI NVS memory region at startup 



Introduce new initcall for marking the ACPI NVS memory at startup, so
that it can be saved/restored during hibernation/resume.

Based on a patch by Zhang Rui.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3f4b0ef7

arch/x86/kernel/e820.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -665,6 +665,27 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) 
}

}

#endif

#endif





#ifdef CONFIG_HIBERNATION

/**

 * Mark ACPI NVS memory region, so that we can save/restore it during

 * hibernation and the subsequent resume.

 */

static int __init e820_mark_nvs_memory(void)

{

	int i;



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



		if (ei->type == E820_NVS)

			hibernate_nvs_register(ei->addr, ei->size);

	}



	return 0;

}

core_initcall(e820_mark_nvs_memory);

#endif



/*

/*

 * Early reserved memory areas.

 * Early reserved memory areas.

 */

 */