From 1618dc0f4d343494a4efacd2d038e2792be94193 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 19 Oct 2025 14:02:21 +0200 Subject: [PATCH] drop riscv patch from 6.17 --- ...omic-xchg-in-pudp_huge_get_and_clear.patch | 43 ------------------- queue-6.17/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 queue-6.17/riscv-use-an-atomic-xchg-in-pudp_huge_get_and_clear.patch diff --git a/queue-6.17/riscv-use-an-atomic-xchg-in-pudp_huge_get_and_clear.patch b/queue-6.17/riscv-use-an-atomic-xchg-in-pudp_huge_get_and_clear.patch deleted file mode 100644 index 84a1a31984..0000000000 --- a/queue-6.17/riscv-use-an-atomic-xchg-in-pudp_huge_get_and_clear.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 668208b161a0b679427e7d0f34c0a65fd7d23979 Mon Sep 17 00:00:00 2001 -From: Alexandre Ghiti -Date: Thu, 14 Aug 2025 12:06:14 +0000 -Subject: riscv: use an atomic xchg in pudp_huge_get_and_clear() - -From: Alexandre Ghiti - -commit 668208b161a0b679427e7d0f34c0a65fd7d23979 upstream. - -Make sure we return the right pud value and not a value that could have -been overwritten in between by a different core. - -Link: https://lkml.kernel.org/r/20250814-dev-alex-thp_pud_xchg-v1-1-b4704dfae206@rivosinc.com -Fixes: c3cc2a4a3a23 ("riscv: Add support for PUD THP") -Signed-off-by: Alexandre Ghiti -Cc: Andrew Donnellan -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/pgtable.h | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/arch/riscv/include/asm/pgtable.h -+++ b/arch/riscv/include/asm/pgtable.h -@@ -959,6 +959,17 @@ static inline pud_t pudp_huge_get_and_cl - return pud; - } - -+#define __HAVE_ARCH_PUDP_HUGE_GET_AND_CLEAR -+static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm, -+ unsigned long address, pud_t *pudp) -+{ -+ pud_t pud = __pud(atomic_long_xchg((atomic_long_t *)pudp, 0)); -+ -+ page_table_check_pud_clear(mm, pud); -+ -+ return pud; -+} -+ - static inline int pud_young(pud_t pud) - { - return pte_young(pud_pte(pud)); diff --git a/queue-6.17/series b/queue-6.17/series index 66963d4e26..03236441c4 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -251,7 +251,6 @@ powerpc-pseries-msi-fix-potential-underflow-and-leak-issue.patch pwm-berlin-fix-wrong-register-in-suspend-resume.patch pwm-fix-incorrect-variable-used-in-error-message.patch revert-ipmi-fix-msg-stack-when-ipmi-is-disconnected.patch -riscv-use-an-atomic-xchg-in-pudp_huge_get_and_clear.patch sched-deadline-fix-race-in-push_dl_task.patch scsi-hpsa-fix-potential-memory-leak-in-hpsa_big_passthru_ioctl.patch scsi-sd-fix-build-warning-in-sd_revalidate_disk.patch -- 2.47.3