Commit c7fa7701 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Standardise __ptep_test_and_clear_young() params between PPC32 and PPC64 



On PPC32, __ptep_test_and_clear_young() takes the mm->context.id

In preparation of standardising pte_update() params between PPC32 and
PPC64, __ptep_test_and_clear_young() need mm instead of mm->context.id

Replace context param by mm.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/0a65470e50a14373b7c2291184514aa982462255.1589866984.git.christophe.leroy@csgroup.eu
parent 1c1bf294

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

+4 −3
Original line number Diff line number Diff line
@@ -288,18 +288,19 @@ static inline pte_basic_t pte_update(pte_t *p, unsigned long clr, unsigned long 
 * for our hash-based implementation, we fix that up here.

 */

#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

static inline int __ptep_test_and_clear_young(unsigned int context, unsigned long addr, pte_t *ptep)

static inline int __ptep_test_and_clear_young(struct mm_struct *mm,

					      unsigned long addr, pte_t *ptep)

{

	unsigned long old;

	old = pte_update(ptep, _PAGE_ACCESSED, 0);

	if (old & _PAGE_HASHPTE) {

		unsigned long ptephys = __pa(ptep) & PAGE_MASK;

		flush_hash_pages(context, addr, ptephys, 1);

		flush_hash_pages(mm->context.id, addr, ptephys, 1);

	}

	return (old & _PAGE_ACCESSED) != 0;

}

#define ptep_test_and_clear_young(__vma, __addr, __ptep) \

	__ptep_test_and_clear_young((__vma)->vm_mm->context.id, __addr, __ptep)

	__ptep_test_and_clear_young((__vma)->vm_mm, __addr, __ptep)



#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

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

+3 −2
Original line number Diff line number Diff line
@@ -256,14 +256,15 @@ static inline pte_basic_t pte_update(pte_t *p, unsigned long clr, unsigned long 
}



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

static inline int __ptep_test_and_clear_young(unsigned int context, unsigned long addr, pte_t *ptep)

static inline int __ptep_test_and_clear_young(struct mm_struct *mm,

					      unsigned long addr, pte_t *ptep)

{

	unsigned long old;

	old = pte_update(ptep, _PAGE_ACCESSED, 0);

	return (old & _PAGE_ACCESSED) != 0;

}

#define ptep_test_and_clear_young(__vma, __addr, __ptep) \

	__ptep_test_and_clear_young((__vma)->vm_mm->context.id, __addr, __ptep)

	__ptep_test_and_clear_young((__vma)->vm_mm, __addr, __ptep)



#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE