diff options
| author |   Rafael J. Wysocki <rjw@sisk.pl> | 2008-10-31 01:02:41 +0100 |
|---|---|---|
| committer |   Len Brown <len.brown@intel.com> | 2008-12-19 04:40:35 -0500 |
| commit | b69edc76539be6a4aa39a22f85365fd4a3b3b9d2 (patch) | |
| tree | 4c88f2ee53ef1a97d2dc9cef5ea173f5ecc54367 /arch/x86/kernel/e820.c | |
| parent | ACPI hibernate: Add a mechanism to save/restore ACPI NVS memory (diff) | |
| download | linux-dev-b69edc76539be6a4aa39a22f85365fd4a3b3b9d2.tar.xz linux-dev-b69edc76539be6a4aa39a22f85365fd4a3b3b9d2.zip | |
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: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 7aafeb5263ef..74c6a21fdc8c 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -665,6 +665,27 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) } #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. */ |