Commit aa232204 authored by Kemeng Shi's avatar Kemeng Shi Committed by Andrew Morton
Browse files

mm/page_table_check: remove unused parameter in [__]page_table_check_pte_clear 

Remove unused addr in page_table_check_pte_clear and
__page_table_check_pte_clear.

Link: https://lkml.kernel.org/r/20230713172636.1705415-4-shikemeng@huaweicloud.com


Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 2f933eaf

arch/arm64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, 
{

	pte_t pte = __pte(xchg_relaxed(&pte_val(*ptep), 0));



	page_table_check_pte_clear(mm, address, pte);

	page_table_check_pte_clear(mm, pte);



	return pte;

}

arch/riscv/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, 
{

	pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0));



	page_table_check_pte_clear(mm, address, pte);

	page_table_check_pte_clear(mm, pte);



	return pte;

}

arch/x86/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
				       pte_t *ptep)

{

	pte_t pte = native_ptep_get_and_clear(ptep);

	page_table_check_pte_clear(mm, addr, pte);

	page_table_check_pte_clear(mm, pte);

	return pte;

}
@@ -1084,7 +1084,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, 
		 * care about updates and native needs no locking

		 */

		pte = native_local_ptep_get_and_clear(ptep);

		page_table_check_pte_clear(mm, addr, pte);

		page_table_check_pte_clear(mm, pte);

	} else {

		pte = ptep_get_and_clear(mm, addr, ptep);

	}

include/linux/page_table_check.h

+4 −7
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ extern struct static_key_true page_table_check_disabled; 
extern struct page_ext_operations page_table_check_ops;



void __page_table_check_zero(struct page *page, unsigned int order);

void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr,

				  pte_t pte);

void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte);

void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,

				  pmd_t pmd);

void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
@@ -46,13 +45,12 @@ static inline void page_table_check_free(struct page *page, unsigned int order) 
	__page_table_check_zero(page, order);

}



static inline void page_table_check_pte_clear(struct mm_struct *mm,

					      unsigned long addr, pte_t pte)

static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)

{

	if (static_branch_likely(&page_table_check_disabled))

		return;



	__page_table_check_pte_clear(mm, addr, pte);

	__page_table_check_pte_clear(mm, pte);

}



static inline void page_table_check_pmd_clear(struct mm_struct *mm,
@@ -123,8 +121,7 @@ static inline void page_table_check_free(struct page *page, unsigned int order) 
{

}



static inline void page_table_check_pte_clear(struct mm_struct *mm,

					      unsigned long addr, pte_t pte)

static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)

{

}

include/linux/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, 
{

	pte_t pte = ptep_get(ptep);

	pte_clear(mm, address, ptep);

	page_table_check_pte_clear(mm, address, pte);

	page_table_check_pte_clear(mm, pte);

	return pte;

}

#endif