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

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

x86: move pgalloc pud and pgd operations into common place 



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 170fdff7

arch/x86/mm/init_64.c

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

#endif



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,

arch/x86/mm/pgtable.c

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) 
	paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);

	tlb_remove_page(tlb, virt_to_page(pmd));

}



#if PAGETABLE_LEVELS > 3

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

{

	tlb_remove_page(tlb, virt_to_page(pud));

}

#endif	/* PAGETABLE_LEVELS > 3 */

#endif	/* PAGETABLE_LEVELS > 2 */



#ifdef CONFIG_X86_64

include/asm-x86/pgalloc.h

+30 −6
Original line number Diff line number Diff line
@@ -71,12 +71,36 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) 
}



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

#endif	/* PAGETABLE_LEVELS > 2 */



#ifdef CONFIG_X86_32

# include "pgalloc_32.h"

#else

# include "pgalloc_64.h"

#endif

#ifdef CONFIG_X86_PAE

extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);

#else	/* !CONFIG_X86_PAE */

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

{

	paravirt_alloc_pd(mm, __pa(pmd) >> PAGE_SHIFT);

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

}

#endif	/* CONFIG_X86_PAE */



#if PAGETABLE_LEVELS > 3

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

{

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

}



static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);

}



static inline void pud_free(struct mm_struct *mm, pud_t *pud)

{

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

	free_page((unsigned long)pud);

}



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

#endif	/* PAGETABLE_LEVELS > 3 */

#endif	/* PAGETABLE_LEVELS > 2 */



#endif	/* _ASM_X86_PGALLOC_H */

include/asm-x86/pgalloc_32.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
#ifndef _I386_PGALLOC_H

#define _I386_PGALLOC_H



#ifdef CONFIG_X86_PAE

extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);



#endif	/* CONFIG_X86_PAE */



#endif /* _I386_PGALLOC_H */

include/asm-x86/pgalloc_64.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#ifndef _X86_64_PGALLOC_H

#define _X86_64_PGALLOC_H



#include <asm/pda.h>



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)));

}



static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);

}



static inline void pud_free(struct mm_struct *mm, pud_t *pud)

{

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

	free_page((unsigned long)pud);

}



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



#endif /* _X86_64_PGALLOC_H */