From 3050184470230eea7f3bff1ac9b99b6595ab5e79 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 30 Jan 2008 13:31:09 +0100 Subject: [PATCH] --- yaml --- r: 79954 b: refs/heads/master c: 27ec161f93b8f018e0270a5383ea1d1c36f00c8a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 3 +-- trunk/include/asm-x86/pgtable_64.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d4f47f765624..2c4765f0a434 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fd1fe9c582e00ca0a98f852cd693dc3caf607a0 +refs/heads/master: 27ec161f93b8f018e0270a5383ea1d1c36f00c8a diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index 5cadbb40da3e..15e05a004fcf 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/arch/x86/mm/init_64.c @@ -742,8 +742,7 @@ int __meminit vmemmap_populate(struct page *start_page, if (!p) return -ENOMEM; - entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); - mk_pte_huge(entry); + entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL_LARGE); set_pmd(pmd, __pmd(pte_val(entry))); printk(KERN_DEBUG " [%lx-%lx] PMD ->%p on node %d\n", diff --git a/trunk/include/asm-x86/pgtable_64.h b/trunk/include/asm-x86/pgtable_64.h index 3072619365a8..5c252d9fee1b 100644 --- a/trunk/include/asm-x86/pgtable_64.h +++ b/trunk/include/asm-x86/pgtable_64.h @@ -355,7 +355,6 @@ static inline int pmd_large(pmd_t pte) { /* page, protection -> pte */ #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) -#define mk_pte_huge(entry) (pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE) /* Change flags of a PTE */ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)