3 files changed, 14 insertions, 11 deletions

diff --git a/arch/x86/include/asm/init.h b/arch/x86/include/asm/init.h
index 223042086f4e..737da62bfeb0 100644
--- a/arch/x86/include/asm/init.h
+++ b/arch/x86/include/asm/init.h
@@ -5,10 +5,10 @@ struct x86_mapping_info {
         void *(*alloc_pgt_page)(void *); /* allocate buf for page table */
         void *context;                   /* context for alloc_pgt_page */
         unsigned long pmd_flag;          /* page flag for PMD entry */
-        bool kernel_mapping;             /* kernel mapping or ident mapping */
+        unsigned long offset;            /* ident mapping offset */
 };
 
 int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
-                                unsigned long addr, unsigned long end);
+                                unsigned long pstart, unsigned long pend);
 
 #endif /* _ASM_X86_INIT_H */
diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c
index ec21796ac5fd..4473cb4f8b90 100644
--- a/arch/x86/mm/ident_map.c
+++ b/arch/x86/mm/ident_map.c
@@ -3,15 +3,17 @@
  * included by both the compressed kernel and the regular kernel.
  */
 
-static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
+static void ident_pmd_init(struct x86_mapping_info *info, pmd_t *pmd_page,
                            unsigned long addr, unsigned long end)
 {
         addr &= PMD_MASK;
         for (; addr < end; addr += PMD_SIZE) {
                 pmd_t *pmd = pmd_page + pmd_index(addr);
 
-                if (!pmd_present(*pmd))
-                        set_pmd(pmd, __pmd(addr | pmd_flag));
+                if (pmd_present(*pmd))
+                        continue;
+
+                set_pmd(pmd, __pmd((addr - info->offset) | info->pmd_flag));
         }
 }
 
@@ -30,13 +32,13 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
 
                 if (pud_present(*pud)) {
                         pmd = pmd_offset(pud, 0);
-                        ident_pmd_init(info->pmd_flag, pmd, addr, next);
+                        ident_pmd_init(info, pmd, addr, next);
                         continue;
                 }
                 pmd = (pmd_t *)info->alloc_pgt_page(info->context);
                 if (!pmd)
                         return -ENOMEM;
-                ident_pmd_init(info->pmd_flag, pmd, addr, next);
+                ident_pmd_init(info, pmd, addr, next);
                 set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
         }
 
@@ -44,14 +46,15 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
 }
 
 int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
-                              unsigned long addr, unsigned long end)
+                              unsigned long pstart, unsigned long pend)
 {
+        unsigned long addr = pstart + info->offset;
+        unsigned long end = pend + info->offset;
         unsigned long next;
         int result;
-        int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
 
         for (; addr < end; addr = next) {
-                pgd_t *pgd = pgd_page + pgd_index(addr) + off;
+                pgd_t *pgd = pgd_page + pgd_index(addr);
                 pud_t *pud;
 
                 next = (addr & PGDIR_MASK) + PGDIR_SIZE;
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index f0b5f2d402af..a3e3ccc87138 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -87,7 +87,7 @@ static int set_up_temporary_mappings(void)
         struct x86_mapping_info info = {
                 .alloc_pgt_page = alloc_pgt_page,
                 .pmd_flag       = __PAGE_KERNEL_LARGE_EXEC,
-                .kernel_mapping = true,
+                .offset         = __PAGE_OFFSET,
         };
         unsigned long mstart, mend;
         pgd_t *pgd;