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 ebab8ecd78b203978e76b5cf6b1979b09b1318a8..6bb1f5bdc5d26e23461bc9d007020892100ef86c 100644 (file)
--- 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;