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

Commit e4c1112c authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: Change function prototype 



In later patch, we use the vma and psize to do tlb flush. Do the prototype
update in separate patch to make the review easy.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 044003b5

arch/powerpc/include/asm/book3s/32/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -235,9 +235,10 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, 
}





static inline void __ptep_set_access_flags(struct mm_struct *mm,

static inline void __ptep_set_access_flags(struct vm_area_struct *vma,

					   pte_t *ptep, pte_t entry,

					   unsigned long address)

					   unsigned long address,

					   int psize)

{

	unsigned long set = pte_val(entry) &

		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);

arch/powerpc/include/asm/book3s/64/pgtable.h

+5 −3
Original line number Diff line number Diff line
@@ -767,12 +767,14 @@ static inline bool check_pte_access(unsigned long access, unsigned long ptev) 
 * Generic functions with hash/radix callbacks

 */



static inline void __ptep_set_access_flags(struct mm_struct *mm,

static inline void __ptep_set_access_flags(struct vm_area_struct *vma,

					   pte_t *ptep, pte_t entry,

					   unsigned long address)

					   unsigned long address,

					   int psize)

{

	if (radix_enabled())

		return radix__ptep_set_access_flags(mm, ptep, entry, address);

		return radix__ptep_set_access_flags(vma, ptep, entry,

						    address, psize);

	return hash__ptep_set_access_flags(ptep, entry);

}

arch/powerpc/include/asm/book3s/64/radix.h

+3 −2
Original line number Diff line number Diff line
@@ -124,8 +124,9 @@ extern void radix__mark_rodata_ro(void); 
extern void radix__mark_initmem_nx(void);

#endif



extern void radix__ptep_set_access_flags(struct mm_struct *mm, pte_t *ptep,

					 pte_t entry, unsigned long address);

extern void radix__ptep_set_access_flags(struct vm_area_struct *vma, pte_t *ptep,

					 pte_t entry, unsigned long address,

					 int psize);



static inline unsigned long __radix_pte_update(pte_t *ptep, unsigned long clr,

					       unsigned long set)

arch/powerpc/include/asm/nohash/32/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -256,9 +256,10 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, 
}





static inline void __ptep_set_access_flags(struct mm_struct *mm,

static inline void __ptep_set_access_flags(struct vm_area_struct *vma,

					   pte_t *ptep, pte_t entry,

					   unsigned long address)

					   unsigned long address,

					   int psize)

{

	unsigned long set = pte_val(entry) &

		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);

arch/powerpc/include/asm/nohash/64/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -281,9 +281,10 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, 
/* Set the dirty and/or accessed bits atomically in a linux PTE, this

 * function doesn't need to flush the hash entry

 */

static inline void __ptep_set_access_flags(struct mm_struct *mm,

static inline void __ptep_set_access_flags(struct vm_area_struct *vma,

					   pte_t *ptep, pte_t entry,

					   unsigned long address)

					   unsigned long address,

					   int psize)

{

	unsigned long bits = pte_val(entry) &

		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);