diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-01-30 13:31:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:31:09 +0100 |
| commit | 27ec161f93b8f018e0270a5383ea1d1c36f00c8a (patch) | |
| tree | be8f7601ef5684226f9f21e2489cb136ccac55fe | |
| parent | 5fd1fe9c582e00ca0a98f852cd693dc3caf607a0 (diff) | |
| download | op-kernel-dev-27ec161f93b8f018e0270a5383ea1d1c36f00c8a.zip op-kernel-dev-27ec161f93b8f018e0270a5383ea1d1c36f00c8a.tar.gz | |
x86: kill mk_pte_huge
It only has a single use, which can be trivially replaced.
Signed-off-by: Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/mm/init_64.c | 3 | ||||
| -rw-r--r-- | include/asm-x86/pgtable_64.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 5cadbb4..15e05a0 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 3072619..5c252d9 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) |
