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

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

x86: demacro asm-x86/pgalloc_32.h 



Convert macros into inline functions, for better type-checking.

This patch required a little bit of fiddling with headers in order to
make __(pte|pmd)_free_tlb inline rather than macros.
asm-generic/tlb.h includes asm/pgalloc.h, though it doesn't directly
use any pgalloc definitions.  I removed this include to avoid an
include cycle, but it may cause secondary compile failures by things
depending on the indirect inclusion; arch/x86/mm/hugetlbpage.c was one
such place; there may be others.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6c435456

arch/x86/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <asm/mman.h>

#include <asm/tlb.h>

#include <asm/tlbflush.h>

#include <asm/pgalloc.h>



static unsigned long page_table_shareable(struct vm_area_struct *svma,

				struct vm_area_struct *vma,
@@ -88,7 +89,7 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 


	spin_lock(&mm->page_table_lock);

	if (pud_none(*pud))

		pud_populate(mm, pud, (unsigned long) spte & PAGE_MASK);

		pud_populate(mm, pud, (pmd_t *)((unsigned long)spte & PAGE_MASK));

	else

		put_page(virt_to_page(spte));

	spin_unlock(&mm->page_table_lock);

arch/x86/mm/init_32.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/apic.h>

#include <asm/tlb.h>

#include <asm/tlbflush.h>

#include <asm/pgalloc.h>

#include <asm/sections.h>

#include <asm/paravirt.h>

include/asm-generic/tlb.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#include <linux/swap.h>

#include <linux/quicklist.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>



/*

include/asm-x86/pgalloc_32.h

+39 −22
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#include <linux/threads.h>

#include <linux/mm.h>		/* for struct page */

#include <asm/tlb.h>

#include <asm-generic/tlb.h>



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>
@@ -14,19 +16,20 @@ 
#define paravirt_release_pd(pfn) do { } while (0)

#endif



#define pmd_populate_kernel(mm, pmd, pte)			\

do {								\

	paravirt_alloc_pt(mm, __pa(pte) >> PAGE_SHIFT);		\

	set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)));		\

} while (0)

static inline void pmd_populate_kernel(struct mm_struct *mm,

				       pmd_t *pmd, pte_t *pte)

{

	paravirt_alloc_pt(mm, __pa(pte) >> PAGE_SHIFT);

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

}



#define pmd_populate(mm, pmd, pte) 				\

do {								\

	paravirt_alloc_pt(mm, page_to_pfn(pte));		\

	set_pmd(pmd, __pmd(_PAGE_TABLE +			\

		((unsigned long long)page_to_pfn(pte) <<	\

			(unsigned long long) PAGE_SHIFT)));	\

} while (0)

static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)

{

	unsigned long pfn = page_to_pfn(pte);



	paravirt_alloc_pt(mm, pfn);

	set_pmd(pmd, __pmd(((pteval_t)pfn << PAGE_SHIFT) | _PAGE_TABLE));

}



/*

 * Allocate and free page tables.
@@ -48,20 +51,34 @@ static inline void pte_free(struct page *pte) 
}





#define __pte_free_tlb(tlb,pte) 					\

do {									\

	paravirt_release_pt(page_to_pfn(pte));				\

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

} while (0)

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

{

	paravirt_release_pt(page_to_pfn(pte));

	tlb_remove_page(tlb, pte);

}



#ifdef CONFIG_X86_PAE

/*

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

 */

#define pmd_alloc_one(mm, addr)		({ BUG(); ((pmd_t *)2); })

#define pmd_free(x)			do { } while (0)

#define __pmd_free_tlb(tlb,x)		do { } while (0)

#define pud_populate(mm, pmd, pte)	BUG()

#endif

static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	BUG();

	return (pmd_t *)2;

}



static inline void pmd_free(pmd_t *pmd)

{

}



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

{

}



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

{

	BUG();

}

#endif	/* CONFIG_X86_PAE */



#endif /* _I386_PGALLOC_H */

include/asm-x86/pgtable-3level.h

+0 −2
Original line number Diff line number Diff line
@@ -157,6 +157,4 @@ static inline unsigned long pte_pfn(pte_t pte) 
#define __pte_to_swp_entry(pte)		((swp_entry_t){ (pte).pte_high })

#define __swp_entry_to_pte(x)		((pte_t){ { .pte_high = (x).val } })



#define __pmd_free_tlb(tlb, x)		do { } while (0)



#endif /* _I386_PGTABLE_3LEVEL_H */