x86_32: Mark ACPI NVS memory region.
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
---
arch/x86/kernel/e820_32.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
Index: linux-2.6/arch/x86/kernel/e820_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820_32.c 2008-07-01 09:32:27.000000000 +0800
+++ linux-2.6/arch/x86/kernel/e820_32.c 2008-07-03 09:00:37.000000000 +0800
@@ -10,6 +10,8 @@
#include <linux/pfn.h>
#include <linux/uaccess.h>
#include <linux/suspend.h>
+#include <linux/efi.h>
+#include <linux/acpi.h>
#include <asm/pgtable.h>
#include <asm/page.h>
@@ -253,6 +255,30 @@
break;
}
}
+
+/* Mark ACPI NVS region so that OS can save/restore it during hibernation */
+static int __init e820_mark_nvs_memory(void)
+{
+ int i;
+
+ if (efi_enabled)
+ return 0;
+
+ for (i = 0; i < e820.nr_map; i++) {
+ struct e820entry *ei = &e820.map[i];
+ unsigned long start, end;
+
+ if (ei->type != E820_NVS)
+ continue;
+ start = PFN_UP(ei->addr);
+ end = PFN_DOWN(ei->addr + ei->size);
+ if (start >= end)
+ continue;
+ acpi_mark_nvs_region(start, end - 1);
+ }
+ return 0;
+}
+core_initcall(e820_mark_nvs_memory);
#endif
void __init add_memory_region(unsigned long long start,
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
