2 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 11a58001b4ce..27f7fc69cf8a 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -310,6 +310,7 @@ repeat:
                                         __pgprot(PTE_IDENT_ATTR |
                                                  _PAGE_PSE);
 
+                                pfn &= PMD_MASK >> PAGE_SHIFT;
                                 addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
                                         PAGE_OFFSET + PAGE_SIZE-1;
 
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 32c7e3847cf6..869372a5d3cf 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -464,7 +464,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
                         pages++;
                         spin_lock(&init_mm.page_table_lock);
                         set_pte((pte_t *)pmd,
-                                pfn_pte(address >> PAGE_SHIFT,
+                                pfn_pte((address & PMD_MASK) >> PAGE_SHIFT,
                                         __pgprot(pgprot_val(prot) | _PAGE_PSE)));
                         spin_unlock(&init_mm.page_table_lock);
                         last_map_addr = next;
@@ -541,7 +541,8 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
                         pages++;
                         spin_lock(&init_mm.page_table_lock);
                         set_pte((pte_t *)pud,
-                                pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE));
+                                pfn_pte((addr & PUD_MASK) >> PAGE_SHIFT,
+                                        PAGE_KERNEL_LARGE));
                         spin_unlock(&init_mm.page_table_lock);
                         last_map_addr = next;
                         continue;