Commit 8f1b7f4b authored by Catalin Marinas's avatar Catalin Marinas Committed by Kefeng Wang
Browse files

arm64: Mark the 'addr' argument to set_ptes() and __set_pte_at() as unused 

mainline inclusion
from mainline-v6.7-rc1
commit dba2ff4922b3cf573c25c3886e869258a6076030
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHB4


CVE: NA

-------------------------------------------------

This argument is not used by the arm64 implementation. Mark it as
__always_unused and also remove the unnecessary 'addr' increment in
set_ptes().

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202310140531.BQQwt3NQ-lkp@intel.com/


Cc: Will Deacon <will@kernel.org>
Tested-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Link: https://lore.kernel.org/r/ZS6EvMiJ0QF5INkv@arm.com


(cherry picked from commit dba2ff4922b3cf573c25c3886e869258a6076030)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent 687002a6

arch/arm64/include/asm/pgtable.h

+5 −4
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ static inline void __sync_cache_and_tags(pte_t pte, unsigned int nr_pages) 
		mte_sync_tags(pte, nr_pages);

}



static inline void set_ptes(struct mm_struct *mm, unsigned long addr,

static inline void set_ptes(struct mm_struct *mm,

			    unsigned long __always_unused addr,

			    pte_t *ptep, pte_t pte, unsigned int nr)

{

	page_table_check_ptes_set(mm, ptep, pte, nr);
@@ -353,7 +354,6 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr, 
		if (--nr == 0)

			break;

		ptep++;

		addr += PAGE_SIZE;

		pte_val(pte) += PAGE_SIZE;

	}

}
@@ -528,7 +528,8 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) 
#define pud_pfn(pud)		((__pud_to_phys(pud) & PUD_MASK) >> PAGE_SHIFT)

#define pfn_pud(pfn,prot)	__pud(__phys_to_pud_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot))



static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,

static inline void __set_pte_at(struct mm_struct *mm,

				unsigned long __always_unused addr,

				pte_t *ptep, pte_t pte, unsigned int nr)

{

	__sync_cache_and_tags(pte, nr);