p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hugetlb: introduce generic version of huge_pte_none() 

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

Link: http://lkml.kernel.org/r/20180920060358.16606-7-alex@ghiti.fr
Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Mike 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexandre Ghiti 2018-10-26 15:08:22 -07:00 committed by Linus Torvalds
parent fe632225bd
commit cae72abc1a
10 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/include/asm/hugetlb.h
View File

@ -44,11 +44,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

5
arch/arm64/include/asm/hugetlb.h
View File

@ -42,11 +42,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

5
arch/ia64/include/asm/hugetlb.h
View File

@ -26,11 +26,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
{ {
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

1
arch/mips/include/asm/hugetlb.h
View File

@ -55,6 +55,7 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
flush_tlb_page(vma, addr & huge_page_mask(hstate_vma(vma))); flush_tlb_page(vma, addr & huge_page_mask(hstate_vma(vma)));
} }
#define __HAVE_ARCH_HUGE_PTE_NONE
static inline int huge_pte_none(pte_t pte) static inline int huge_pte_none(pte_t pte)
{ {
unsigned long val = pte_val(pte) & ~_PAGE_GLOBAL; unsigned long val = pte_val(pte) & ~_PAGE_GLOBAL;

5
arch/parisc/include/asm/hugetlb.h
View File

@ -38,11 +38,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
{ {
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

5
arch/powerpc/include/asm/hugetlb.h
View File

@ -149,11 +149,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
flush_hugetlb_page(vma, addr); flush_hugetlb_page(vma, addr);
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

5
arch/sh/include/asm/hugetlb.h
View File

@ -31,11 +31,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
{ {
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

5
arch/sparc/include/asm/hugetlb.h
View File

@ -48,11 +48,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
{ {
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

5
arch/x86/include/asm/hugetlb.h
View File

@ -28,11 +28,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
static inline pte_t huge_pte_wrprotect(pte_t pte) static inline pte_t huge_pte_wrprotect(pte_t pte)
{ {
return pte_wrprotect(pte); return pte_wrprotect(pte);

7
include/asm-generic/hugetlb.h
View File

@ -73,4 +73,11 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
} }
#endif #endif
#ifndef __HAVE_ARCH_HUGE_PTE_NONE
static inline int huge_pte_none(pte_t pte)
{
return pte_none(pte);
}
#endif
#endif /* _ASM_GENERIC_HUGETLB_H */ #endif /* _ASM_GENERIC_HUGETLB_H */