diff options
| author | Len Brown <len.brown@intel.com> | 2012-01-18 00:18:10 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-18 00:18:10 -0500 |
| commit | 037d76f40430ba1269dc7d1fee22382cd9672997 (patch) | |
| tree | 0a378e88951655aa0042645fbd12b7058be95c3e /arch | |
| parent | 5d1f86572685d577b76142b7c61453000e1a5e26 (diff) | |
| parent | 4134b8c8811f23aa8a281db50dcee64dda414736 (diff) | |
Merge branch 'apei' into release
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/e820.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 303a0e48f076..51c3b186e5b9 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -714,7 +714,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) } #endif -#ifdef CONFIG_HIBERNATION +#ifdef CONFIG_ACPI /** * Mark ACPI NVS memory region, so that we can save/restore it during * hibernation and the subsequent resume. @@ -727,7 +727,7 @@ static int __init e820_mark_nvs_memory(void) struct e820entry *ei = &e820.map[i]; if (ei->type == E820_NVS) - suspend_nvs_register(ei->addr, ei->size); + acpi_nvs_register(ei->addr, ei->size); } return 0; |