2 files changed, 22 insertions, 46 deletions

diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index 74202c1910cd..7d28c885d238 100644
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -129,8 +129,6 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
                 }
         }
 
-        resume_map_numa_kva(pgd_base);
-
         return 0;
 }
 
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index 460f314d13e5..a0fde91c16cf 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -11,6 +11,8 @@
 #include <linux/gfp.h>
 #include <linux/smp.h>
 #include <linux/suspend.h>
+
+#include <asm/init.h>
 #include <asm/proto.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -39,41 +41,21 @@ pgd_t *temp_level4_pgt;
 
 void *relocated_restore_code;
 
-static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
+static void *alloc_pgt_page(void *context)
 {
-        long i, j;
-
-        i = pud_index(address);
-        pud = pud + i;
-        for (; i < PTRS_PER_PUD; pud++, i++) {
-                unsigned long paddr;
-                pmd_t *pmd;
-
-                paddr = address + i*PUD_SIZE;
-                if (paddr >= end)
-                        break;
-
-                pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);
-                if (!pmd)
-                        return -ENOMEM;
-                set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
-                for (j = 0; j < PTRS_PER_PMD; pmd++, j++, paddr += PMD_SIZE) {
-                        unsigned long pe;
-
-                        if (paddr >= end)
-                                break;
-                        pe = __PAGE_KERNEL_LARGE_EXEC | paddr;
-                        pe &= __supported_pte_mask;
-                        set_pmd(pmd, __pmd(pe));
-                }
-        }
-        return 0;
+        return (void *)get_safe_page(GFP_ATOMIC);
 }
 
 static int set_up_temporary_mappings(void)
 {
-        unsigned long start, end, next;
-        int error;
+        struct x86_mapping_info info = {
+                .alloc_pgt_page = alloc_pgt_page,
+                .pmd_flag       = __PAGE_KERNEL_LARGE_EXEC,
+                .kernel_mapping = true,
+        };
+        unsigned long mstart, mend;
+        int result;
+        int i;
 
         temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);
         if (!temp_level4_pgt)
@@ -84,21 +66,17 @@ static int set_up_temporary_mappings(void)
                 init_level4_pgt[pgd_index(__START_KERNEL_map)]);
 
         /* Set up the direct mapping from scratch */
-        start = (unsigned long)pfn_to_kaddr(0);
-        end = (unsigned long)pfn_to_kaddr(max_pfn);
-
-        for (; start < end; start = next) {
-                pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);
-                if (!pud)
-                        return -ENOMEM;
-                next = start + PGDIR_SIZE;
-                if (next > end)
-                        next = end;
-                if ((error = res_phys_pud_init(pud, __pa(start), __pa(next))))
-                        return error;
-                set_pgd(temp_level4_pgt + pgd_index(start),
-                        mk_kernel_pgd(__pa(pud)));
+        for (i = 0; i < nr_pfn_mapped; i++) {
+                mstart = pfn_mapped[i].start << PAGE_SHIFT;
+                mend   = pfn_mapped[i].end << PAGE_SHIFT;
+
+                result = kernel_ident_mapping_init(&info, temp_level4_pgt,
+                                                   mstart, mend);
+
+                if (result)
+                        return result;
         }
+
         return 0;
 }