mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
hugetlb: introduce generic version of huge_ptep_set_access_flags()
arm, ia64, sh, x86 architectures use the same version of huge_ptep_set_access_flags, so move this generic implementation into asm-generic/hugetlb.h. Link: http://lkml.kernel.org/r/20180920060358.16606-11-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:
parent
8e581d433b
commit
facf6d5b8b
@ -37,11 +37,4 @@ static inline pte_t huge_ptep_get(pte_t *ptep)
|
|||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
|
||||||
unsigned long addr, pte_t *ptep,
|
|
||||||
pte_t pte, int dirty)
|
|
||||||
{
|
|
||||||
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _ASM_ARM_HUGETLB_3LEVEL_H */
|
#endif /* _ASM_ARM_HUGETLB_3LEVEL_H */
|
||||||
|
@ -42,6 +42,7 @@ extern pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,
|
|||||||
#define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT
|
#define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT
|
||||||
extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
|
extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
|
||||||
pte_t *ptep, pte_t pte);
|
pte_t *ptep, pte_t pte);
|
||||||
|
#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS
|
||||||
extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
||||||
unsigned long addr, pte_t *ptep,
|
unsigned long addr, pte_t *ptep,
|
||||||
pte_t pte, int dirty);
|
pte_t pte, int dirty);
|
||||||
|
@ -27,13 +27,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
|
||||||
unsigned long addr, pte_t *ptep,
|
|
||||||
pte_t pte, int dirty)
|
|
||||||
{
|
|
||||||
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pte_t huge_ptep_get(pte_t *ptep)
|
static inline pte_t huge_ptep_get(pte_t *ptep)
|
||||||
{
|
{
|
||||||
return *ptep;
|
return *ptep;
|
||||||
|
@ -63,6 +63,7 @@ static inline int huge_pte_none(pte_t pte)
|
|||||||
return !val || (val == (unsigned long)invalid_pte_table);
|
return !val || (val == (unsigned long)invalid_pte_table);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS
|
||||||
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
||||||
unsigned long addr,
|
unsigned long addr,
|
||||||
pte_t *ptep, pte_t pte,
|
pte_t *ptep, pte_t pte,
|
||||||
|
@ -43,6 +43,7 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
|
|||||||
void huge_ptep_set_wrprotect(struct mm_struct *mm,
|
void huge_ptep_set_wrprotect(struct mm_struct *mm,
|
||||||
unsigned long addr, pte_t *ptep);
|
unsigned long addr, pte_t *ptep);
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS
|
||||||
int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
||||||
unsigned long addr, pte_t *ptep,
|
unsigned long addr, pte_t *ptep,
|
||||||
pte_t pte, int dirty);
|
pte_t pte, int dirty);
|
||||||
|
@ -134,6 +134,7 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
|
|||||||
flush_hugetlb_page(vma, addr);
|
flush_hugetlb_page(vma, addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS
|
||||||
extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
||||||
unsigned long addr, pte_t *ptep,
|
unsigned long addr, pte_t *ptep,
|
||||||
pte_t pte, int dirty);
|
pte_t pte, int dirty);
|
||||||
|
@ -32,13 +32,6 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
|
||||||
unsigned long addr, pte_t *ptep,
|
|
||||||
pte_t pte, int dirty)
|
|
||||||
{
|
|
||||||
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pte_t huge_ptep_get(pte_t *ptep)
|
static inline pte_t huge_ptep_get(pte_t *ptep)
|
||||||
{
|
{
|
||||||
return *ptep;
|
return *ptep;
|
||||||
|
@ -40,6 +40,7 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
|
|||||||
set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
|
set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS
|
||||||
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
||||||
unsigned long addr, pte_t *ptep,
|
unsigned long addr, pte_t *ptep,
|
||||||
pte_t pte, int dirty)
|
pte_t pte, int dirty)
|
||||||
|
@ -13,13 +13,6 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
|
||||||
unsigned long addr, pte_t *ptep,
|
|
||||||
pte_t pte, int dirty)
|
|
||||||
{
|
|
||||||
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline pte_t huge_ptep_get(pte_t *ptep)
|
static inline pte_t huge_ptep_get(pte_t *ptep)
|
||||||
{
|
{
|
||||||
return *ptep;
|
return *ptep;
|
||||||
|
@ -110,4 +110,13 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS
|
||||||
|
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
|
||||||
|
unsigned long addr, pte_t *ptep,
|
||||||
|
pte_t pte, int dirty)
|
||||||
|
{
|
||||||
|
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* _ASM_GENERIC_HUGETLB_H */
|
#endif /* _ASM_GENERIC_HUGETLB_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user