Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397f687a authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: move pte functions into common asm/pgalloc.h 



Common definitions for 2-level pagetable functions.

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 1d262d3a

arch/x86/mm/init_64.c

+0 −6
Original line number Diff line number Diff line
@@ -662,12 +662,6 @@ 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));

arch/x86/mm/pgtable.c

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 
	return pte;

}



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

{

	pgtable_page_dtor(pte);

	paravirt_release_pt(page_to_pfn(pte));

	tlb_remove_page(tlb, pte);

}



#ifdef CONFIG_X86_64

static inline void pgd_list_add(pgd_t *pgd)

{

arch/x86/mm/pgtable_32.c

+0 −7
Original line number Diff line number Diff line
@@ -173,13 +173,6 @@ void reserve_top_address(unsigned long reserve) 
	__VMALLOC_RESERVE += reserve;

}



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

{

	pgtable_page_dtor(pte);

	paravirt_release_pt(page_to_pfn(pte));

	tlb_remove_page(tlb, pte);

}



#ifdef CONFIG_X86_PAE



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

include/asm-x86/pgalloc.h

+16 −0
Original line number Diff line number Diff line
@@ -24,6 +24,22 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); 
extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);

extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);



/* Should really implement gc for free page table pages. This could be

   done with a reference count in struct page. */



static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)

{

	BUG_ON((unsigned long)pte & (PAGE_SIZE-1));

	free_page((unsigned long)pte);

}



static inline void pte_free(struct mm_struct *mm, struct page *pte)

{

	__free_page(pte);

}



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



#ifdef CONFIG_X86_32

# include "pgalloc_32.h"

#else

include/asm-x86/pgalloc_32.h

+0 −18
Original line number Diff line number Diff line
@@ -17,24 +17,6 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p 
}

#define pmd_pgtable(pmd) pmd_page(pmd)



/*

 * Allocate and free page tables.

 */



static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)

{

	free_page((unsigned long)pte);

}



static inline void pte_free(struct mm_struct *mm, pgtable_t pte)

{

	pgtable_page_dtor(pte);

	__free_page(pte);

}





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



#ifdef CONFIG_X86_PAE

/*

 * In the PAE case we free the pmds as part of the pgd.