summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2010-05-28 16:32:14 -0400
committerLen Brown <len.brown@intel.com>2010-06-10 11:02:34 -0400
commitdd4c4f17d722ffeb2515bf781400675a30fcead7 (patch)
tree0190eff340ffeac7800a3d7d1e0c1232c09397ef /arch/x86/kernel/e820.c
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
downloadlinux-dd4c4f17d722ffeb2515bf781400675a30fcead7.tar.gz
linux-dd4c4f17d722ffeb2515bf781400675a30fcead7.tar.bz2
linux-dd4c4f17d722ffeb2515bf781400675a30fcead7.zip
suspend: Move NVS save/restore code to generic suspend functionality
Saving platform non-volatile state may be required for suspend to RAM as well as hibernation. Move it to more generic code. Signed-off-by: Matthew Garrett <mjg@redhat.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Tested-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r--arch/x86/kernel/e820.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 7bca3c6a02fb..0d6fc71bedb1 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -729,7 +729,7 @@ static int __init e820_mark_nvs_memory(void)
struct e820entry *ei = &e820.map[i];
if (ei->type == E820_NVS)
- hibernate_nvs_register(ei->addr, ei->size);
+ suspend_nvs_register(ei->addr, ei->size);
}
return 0;