arm64: hugetlbpage: avoid unused-but-set-parameter warning (gcc-16)
PATCH 1/1 arm64: hugetlbpage: avoid unused-but-set-parameter warning (gcc-16)
From: Arnd Bergmann <[email protected]>
gcc-16 warns about an instance that older compilers did not:
arch/arm64/mm/hugetlbpage.c: In function 'huge_pte_clear':arch/arm64/mm/hugetlbpage.c:369:57: error: parameter 'addr' set but not used [-Werror=unused-but-set-parameter=]
The issue here is that __pte_clear() does not actually use its second argument when CONFIG_ARM64_CONTPTE is disabled.
Reword this to compute the offset each time instead of updating the argument variable. I checked that the resulting object code is unchanged.
--- arch/arm64/mm/hugetlbpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/mm/hugetlbpage.c +2 -2
@@ -374,8 +374,8 @@ void huge_pte_clear(struct mm_struct *mm, unsigned long addr, ncontig =num_contig_ptes (sz, &pgsize); -for (i =0 ; i < ncontig; i++, addr += pgsize, ptep++) -__pte_clear (mm, addr, ptep); +for (i =0 ; i < ncontig; i++, ptep++) +__pte_clear (mm, addr + pgsize*i, ptep); } pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
Signature · 1 line
2.39.5
Catalin Marinas
maintainerQuoted 24 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
gcc-16 warns about an instance that older compilers did not:
arch/arm64/mm/hugetlbpage.c: In function 'huge_pte_clear':arch/arm64/mm/hugetlbpage.c:369:57: error: parameter 'addr' set but not used [-Werror=unused-but-set-parameter=]The issue here is that
__pte_clear()does not actually use its second argument whenCONFIG_ARM64_CONTPTEis disabled.Reword this to compute the offset each time instead of updating the argument variable. I checked that the resulting object code is unchanged.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm64/mm/hugetlbpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm64/mm/hugetlbpage.c +0
-0
arch/arm64/mm/hugetlbpage.c void huge_pte_clear(struct mm_struct *mm, unsigned long addr, · line 378
Quoted 7 lines
arch/arm64/mm/hugetlbpage.c +2
-2@@ -374,8 +374,8 @@ void huge_pte_clear(struct mm_struct *mm, unsigned long addr, ncontig =num_contig_ptes (sz, &pgsize); -for (i =0 ; i < ncontig; i++, addr += pgsize, ptep++) -__pte_clear (mm, addr, ptep); +for (i =0 ; i < ncontig; i++, ptep++) +__pte_clear (mm, addr + pgsize*i, ptep);
Should we not fix the macro instead? Either with a (void)(addr) or just turn it into an inline function (still compiling):
arch/arm64/include/asm/pgtable.h +6 -2
@@ -179,8 +179,6 @@ static inline pteval_t __phys_to_pte_val(phys_addr_t phys) __pte(__phys_to_pte_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot))#define pte_none (pte) (!pte_val(pte)) -#define __pte_clear (mm, addr, ptep) \ - __set_pte(ptep, __pte(0))#define pte_page (pte) (pfn_to_page(pte_pfn(pte)))/*
@@ -1320,6 +1318,12 @@ static inline bool pud_user_accessible_page(pud_t pud)/* * Atomic pte/pmd modifications. */ +static inline void __pte_clear (struct mm_struct *mm, +unsigned long addr,pte_t *ptep) +{ +__set_pte (ptep,__pte (0 )); +} +static inline int __ptep_test_and_clear_young (struct vm_area_struct *vma,unsigned long address,pte_t *ptep)
Quoted 11 lines · Catalin Marinas
Review
Quoted 7 lines · Arnd Bergmann
(quoted diff) +2
-2ncontig = num_contig_ptes(sz, &pgsize); - for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) - __pte_clear(mm, addr, ptep); + for (i = 0; i < ncontig; i++, ptep++) + __pte_clear(mm, addr + pgsize*i, ptep);Should we not fix the macro instead? Either with a (void)(addr) or just turn it into an inline function (still compiling):
Good idea, I'll add your inline function to my randconfig setup instead and will let you know if I run into other problems.
Arnd