From: Jeremy Fitzhardinge Date: Wed, 30 Jan 2008 12:31:09 +0000 (+0100) Subject: x86: kill mk_pte_huge X-Git-Tag: v2.6.25-rc1~1143^2~621 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=27ec161f93b8f018e0270a5383ea1d1c36f00c8a;p=linux-2.6-omap-h63xx.git x86: kill mk_pte_huge It only has a single use, which can be trivially replaced. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 5cadbb40da3..15e05a004fc 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, 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/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 3072619365a..5c252d9fee1 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) { /* 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)