Commit 79bf6d66 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: convert pgalloc_64.h from macros to inlines 



Convert asm-x86/pgalloc_64.h from macros into functions (#include hell
prevents __*_free_tlb from being inline, but they're probably a bit
big to inline anyway).

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 94bc891b

arch/x86/mm/init_64.c

+16 −0
Original line number Diff line number Diff line
@@ -662,6 +662,22 @@ int memory_add_physaddr_to_nid(u64 start) 
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);

#endif



void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte)

{

	pgtable_page_dtor(pte);

	tlb_remove_page(tlb, pte);

}



void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)

{

	tlb_remove_page(tlb, virt_to_page(pmd));

}



void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)

{

	tlb_remove_page(tlb, virt_to_page(pud));

}



#endif /* CONFIG_MEMORY_HOTPLUG */



static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel,

include/asm-x86/pgalloc_64.h

+18 −15
Original line number Diff line number Diff line 
#ifndef _X86_64_PGALLOC_H

#define _X86_64_PGALLOC_H



#include <asm/pda.h>

#include <linux/threads.h>

#include <linux/mm.h>

#include <asm/pda.h>



#define pmd_populate_kernel(mm, pmd, pte) \

		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))

#define pud_populate(mm, pud, pmd) \

		set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)))

#define pgd_populate(mm, pgd, pud) \

		set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)))

static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)

{

	set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)));

}



static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)

{

	set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));

}



static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)

{

	set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));

}



#define pmd_pgtable(pmd) pmd_page(pmd)
@@ -121,13 +129,8 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 
	__free_page(pte);

} 



#define __pte_free_tlb(tlb,pte)				\

do {							\

	pgtable_page_dtor((pte));				\

	tlb_remove_page((tlb), (pte));			\

} while (0)



#define __pmd_free_tlb(tlb,x)   tlb_remove_page((tlb),virt_to_page(x))

#define __pud_free_tlb(tlb,x)   tlb_remove_page((tlb),virt_to_page(x))

extern void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte);

extern void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd);

extern void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud);



#endif /* _X86_64_PGALLOC_H */