1 files changed, 6 insertions, 20 deletions

diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index be8965427a93..13c6c37610e0 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -17,6 +17,8 @@
 #include <linux/kexec.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/suspend.h>
+#include <linux/pfn.h>
 
 #include <asm/pgtable.h>
 #include <asm/page.h>
@@ -256,22 +258,6 @@ void __init e820_reserve_resources(void)
         }
 }
 
-/* Mark pages corresponding to given address range as nosave */
-static void __init
-e820_mark_nosave_range(unsigned long start, unsigned long end)
-{
-        unsigned long pfn, max_pfn;
-
-        if (start >= end)
-                return;
-
-        printk("Nosave address range: %016lx - %016lx\n", start, end);
-        max_pfn = end >> PAGE_SHIFT;
-        for (pfn = start >> PAGE_SHIFT; pfn < max_pfn; pfn++)
-                if (pfn_valid(pfn))
-                        SetPageNosave(pfn_to_page(pfn));
-}
-
 /*
  * Find the ranges of physical addresses that do not correspond to
  * e820 RAM areas and mark the corresponding pages as nosave for software
@@ -290,13 +276,13 @@ void __init e820_mark_nosave_regions(void)
                 struct e820entry *ei = &e820.map[i];
 
                 if (paddr < ei->addr)
-                        e820_mark_nosave_range(paddr,
-                                        round_up(ei->addr, PAGE_SIZE));
+                        register_nosave_region(PFN_DOWN(paddr),
+                                                PFN_UP(ei->addr));
 
                 paddr = round_down(ei->addr + ei->size, PAGE_SIZE);
                 if (ei->type != E820_RAM)
-                        e820_mark_nosave_range(round_up(ei->addr, PAGE_SIZE),
-                                        paddr);
+                        register_nosave_region(PFN_UP(ei->addr),
+                                                PFN_DOWN(paddr));
 
                 if (paddr >= (end_pfn << PAGE_SHIFT))
                         break;