Commit 1e5f50fc authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Linus Torvalds
Browse files

hugetlb: introduce generic version of hugetlb_free_pgd_range 

arm, arm64, mips, parisc, sh, x86 architectures use the same version of
hugetlb_free_pgd_range, so move this generic implementation into
asm-generic/hugetlb.h.

Link: http://lkml.kernel.org/r/20180920060358.16606-3-alex@ghiti.fr


Signed-off-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Tested-by: Helge Deller <deller@gmx.de>			[parisc]
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Acked-by: Paul Burton <paul.burton@mips.com>		[MIPS]
Acked-by: Ingo Molnar <mingo@kernel.org>		[x86]
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d018498c

arch/arm/include/asm/hugetlb.h

+0 −9
Original line number Diff line number Diff line
@@ -27,15 +27,6 @@ 


#include <asm/hugetlb-3level.h>



static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,

					  unsigned long addr, unsigned long end,

					  unsigned long floor,

					  unsigned long ceiling)

{

	free_pgd_range(tlb, addr, end, floor, ceiling);

}





static inline int is_hugepage_only_range(struct mm_struct *mm,

					 unsigned long addr, unsigned long len)

{

arch/arm64/include/asm/hugetlb.h

+0 −10
Original line number Diff line number Diff line
@@ -25,16 +25,6 @@ static inline pte_t huge_ptep_get(pte_t *ptep) 
	return READ_ONCE(*ptep);

}







static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,

					  unsigned long addr, unsigned long end,

					  unsigned long floor,

					  unsigned long ceiling)

{

	free_pgd_range(tlb, addr, end, floor, ceiling);

}



static inline int is_hugepage_only_range(struct mm_struct *mm,

					 unsigned long addr, unsigned long len)

{

arch/ia64/include/asm/hugetlb.h

+3 −2
Original line number Diff line number Diff line
@@ -3,9 +3,8 @@ 
#define _ASM_IA64_HUGETLB_H



#include <asm/page.h>

#include <asm-generic/hugetlb.h>





#define __HAVE_ARCH_HUGETLB_FREE_PGD_RANGE

void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,

			    unsigned long end, unsigned long floor,

			    unsigned long ceiling);
@@ -70,4 +69,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) 
{

}



#include <asm-generic/hugetlb.h>



#endif /* _ASM_IA64_HUGETLB_H */

arch/mips/include/asm/hugetlb.h

+2 −11
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#define __ASM_HUGETLB_H



#include <asm/page.h>

#include <asm-generic/hugetlb.h>





static inline int is_hugepage_only_range(struct mm_struct *mm,

					 unsigned long addr,
@@ -38,15 +36,6 @@ static inline int prepare_hugepage_range(struct file *file, 
	return 0;

}



static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,

					  unsigned long addr,

					  unsigned long end,

					  unsigned long floor,

					  unsigned long ceiling)

{

	free_pgd_range(tlb, addr, end, floor, ceiling);

}



static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

				   pte_t *ptep, pte_t pte)

{
@@ -114,4 +103,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) 
{

}



#include <asm-generic/hugetlb.h>



#endif /* __ASM_HUGETLB_H */

arch/parisc/include/asm/hugetlb.h

+2 −10
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
#define _ASM_PARISC64_HUGETLB_H



#include <asm/page.h>

#include <asm-generic/hugetlb.h>





void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

		     pte_t *ptep, pte_t pte);
@@ -32,14 +30,6 @@ static inline int prepare_hugepage_range(struct file *file, 
	return 0;

}



static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,

					  unsigned long addr, unsigned long end,

					  unsigned long floor,

					  unsigned long ceiling)

{

	free_pgd_range(tlb, addr, end, floor, ceiling);

}



static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,

					 unsigned long addr, pte_t *ptep)

{
@@ -71,4 +61,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) 
{

}



#include <asm-generic/hugetlb.h>



#endif /* _ASM_PARISC64_HUGETLB_H */