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

Commit 8809aa2d authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm: clarify that the function operates on hugepage pte 



We have confusing functions to clear pmd, pmd_clear_* and pmd_clear.  Add
_huge_ to pmdp_clear functions so that we are clear that they operate on
hugepage pte.

We don't bother about other functions like pmdp_set_wrprotect,
pmdp_clear_flush_young, because they operate on PTE bits and hence
indicate they are operating on hugepage ptes

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f28b6ff8

arch/mips/include/asm/pgtable.h

+4 −4
Original line number Diff line number Diff line
@@ -568,11 +568,11 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd) 
}



/*

 * The generic version pmdp_get_and_clear uses a version of pmd_clear() with a

 * The generic version pmdp_huge_get_and_clear uses a version of pmd_clear() with a

 * different prototype.

 */

#define __HAVE_ARCH_PMDP_GET_AND_CLEAR

static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,

#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR

static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,

					    unsigned long address, pmd_t *pmdp)

{

	pmd_t old = *pmdp;

arch/powerpc/include/asm/pgtable-ppc64.h

+3 −3
Original line number Diff line number Diff line
@@ -569,8 +569,8 @@ extern int pmdp_test_and_clear_young(struct vm_area_struct *vma, 
extern int pmdp_clear_flush_young(struct vm_area_struct *vma,

				  unsigned long address, pmd_t *pmdp);



#define __HAVE_ARCH_PMDP_GET_AND_CLEAR

extern pmd_t pmdp_get_and_clear(struct mm_struct *mm,

#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR

extern pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,

				     unsigned long addr, pmd_t *pmdp);



#define __HAVE_ARCH_PMDP_SET_WRPROTECT

arch/powerpc/mm/pgtable_64.c

+2 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr, 
	return;

}



pmd_t pmdp_get_and_clear(struct mm_struct *mm,

pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,

			      unsigned long addr, pmd_t *pmdp)

{

	pmd_t old_pmd;

arch/s390/include/asm/pgtable.h

+12 −12
Original line number Diff line number Diff line
@@ -1498,8 +1498,8 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma, 
	return pmd_young(pmd);

}



#define __HAVE_ARCH_PMDP_GET_AND_CLEAR

static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,

#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR

static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,

					    unsigned long address, pmd_t *pmdp)

{

	pmd_t pmd = *pmdp;
@@ -1509,8 +1509,8 @@ static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm, 
	return pmd;

}



#define __HAVE_ARCH_PMDP_GET_AND_CLEAR_FULL

static inline pmd_t pmdp_get_and_clear_full(struct mm_struct *mm,

#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR_FULL

static inline pmd_t pmdp_huge_get_and_clear_full(struct mm_struct *mm,

						 unsigned long address,

						 pmd_t *pmdp, int full)

{
@@ -1522,11 +1522,11 @@ static inline pmd_t pmdp_get_and_clear_full(struct mm_struct *mm, 
	return pmd;

}



#define __HAVE_ARCH_PMDP_CLEAR_FLUSH

static inline pmd_t pmdp_clear_flush(struct vm_area_struct *vma,

#define __HAVE_ARCH_PMDP_HUGE_CLEAR_FLUSH

static inline pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma,

					  unsigned long address, pmd_t *pmdp)

{

	return pmdp_get_and_clear(vma->vm_mm, address, pmdp);

	return pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);

}



#define __HAVE_ARCH_PMDP_INVALIDATE
@@ -1552,7 +1552,7 @@ static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, 
					unsigned long address,

					pmd_t *pmdp)

{

	return pmdp_get_and_clear(vma->vm_mm, address, pmdp);

	return pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);

}

#define pmdp_collapse_flush pmdp_collapse_flush

arch/sparc/include/asm/pgtable_64.h

+4 −4
Original line number Diff line number Diff line
@@ -865,8 +865,8 @@ static inline unsigned long pud_pfn(pud_t pud) 
void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,

		   pte_t *ptep, pte_t orig, int fullmm);



#define __HAVE_ARCH_PMDP_GET_AND_CLEAR

static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,

#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR

static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,

					    unsigned long addr,

					    pmd_t *pmdp)

{