]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: hugetlbpage: avoid unused-but-set-parameter warning (gcc-16)
authorArnd Bergmann <arnd@arndb.de>
Mon, 16 Feb 2026 10:54:21 +0000 (11:54 +0100)
committerWill Deacon <will@kernel.org>
Thu, 19 Feb 2026 12:33:52 +0000 (12:33 +0000)
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, but when CONFIG_ARM64_CONTPTE is enabled it still gets
updated.

Replace the macro with an inline function to let the compiler see
the argument getting passed down.

Suggested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Dev Jain <dev.jain@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/pgtable.h

index 64d5f1d9cce96c769cbb768173f1cdd3bedeb642..5ab5fe3bef25e9bc6de3fc0bd4cedaeb7fd3d837 100644 (file)
@@ -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,13 @@ 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)