aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/init_64.c3
-rw-r--r--include/asm-x86/pgtable_64.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5cadbb40da3e..15e05a004fcf 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -742,8 +742,7 @@ int __meminit vmemmap_populate(struct page *start_page,
742 if (!p) 742 if (!p)
743 return -ENOMEM; 743 return -ENOMEM;
744 744
745 entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); 745 entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL_LARGE);
746 mk_pte_huge(entry);
747 set_pmd(pmd, __pmd(pte_val(entry))); 746 set_pmd(pmd, __pmd(pte_val(entry)));
748 747
749 printk(KERN_DEBUG " [%lx-%lx] PMD ->%p on node %d\n", 748 printk(KERN_DEBUG " [%lx-%lx] PMD ->%p on node %d\n",
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h
index 3072619365a8..5c252d9fee1b 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/include/asm-x86/pgtable_64.h
@@ -355,7 +355,6 @@ static inline int pmd_large(pmd_t pte) {
355 355
356/* page, protection -> pte */ 356/* page, protection -> pte */
357#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) 357#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
358#define mk_pte_huge(entry) (pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)
359 358
360/* Change flags of a PTE */ 359/* Change flags of a PTE */
361static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 360static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)