From: Paul Walmsley <pjw@kernel.org>
Date: Tue, 18 Nov 2025 04:19:28 +0000 (-0700)
Subject: riscv: mm: use xchg() on non-atomic_long_t variables, not atomic_long_xchg()
X-Git-Tag: v6.19-rc3~4^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0e51a0de02cf0e5008d0e167288ad1598005b9e;p=thirdparty%2Flinux.git

riscv: mm: use xchg() on non-atomic_long_t variables, not atomic_long_xchg()

Let's not call atomic_long_xchg() on something that's not an
atomic_long_t, and just use xchg() instead.  Continues the cleanup
from commit 546e42c8c6d94 ("riscv: Use an atomic xchg in
pudp_huge_get_and_clear()"),

Cc: Alexandre Ghiti <alex@ghiti.fr>
Signed-off-by: Paul Walmsley <pjw@kernel.org>
---

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index ebab8ecd78b2..6bb1f5bdc5d2 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -661,7 +661,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
 				       unsigned long address, pte_t *ptep)
 {
 #ifdef CONFIG_SMP
-	pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0));
+	pte_t pte = __pte(xchg(&ptep->pte, 0));
 #else
 	pte_t pte = *ptep;
 
@@ -1004,7 +1004,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
 					unsigned long address, pmd_t *pmdp)
 {
 #ifdef CONFIG_SMP
-	pmd_t pmd = __pmd(atomic_long_xchg((atomic_long_t *)pmdp, 0));
+	pmd_t pmd = __pmd(xchg(&pmdp->pmd, 0));
 #else
 	pmd_t pmd = *pmdp;