From: Sasha Levin Date: Fri, 29 May 2026 19:15:05 +0000 (-0400) Subject: Fixes for all trees X-Git-Tag: v5.10.258~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e54e3dac9ce50548aafee5145cfaff5f0a040e1;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for all trees Signed-off-by: Sasha Levin --- diff --git a/queue-6.18/drm-msm-restore-second-parameter-name-in-purge-and-e.patch b/queue-6.18/drm-msm-restore-second-parameter-name-in-purge-and-e.patch new file mode 100644 index 0000000000..dee1fd6aae --- /dev/null +++ b/queue-6.18/drm-msm-restore-second-parameter-name-in-purge-and-e.patch @@ -0,0 +1,69 @@ +From ff22057fc969e3c9b036a1e61ef576e9417939c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 May 2026 15:17:14 -0700 +Subject: drm/msm: Restore second parameter name in purge() and evict() + +From: Nathan Chancellor + +[ Upstream commit 53676e4d44d6b38c8a0d9bff331f170ae2e41bbe ] + +After commit 3392291fc509 ("drm/msm: Fix shrinker deadlock"), all +supported versions of clang warn (or error with CONFIG_WERROR=y): + + drivers/gpu/drm/msm/msm_gem_shrinker.c:105:58: error: omitting the parameter name in a function definition is a C23 extension [-Werror,-Wc23-extensions] + 105 | purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) + | ^ + drivers/gpu/drm/msm/msm_gem_shrinker.c:117:58: error: omitting the parameter name in a function definition is a C23 extension [-Werror,-Wc23-extensions] + 117 | evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) + | ^ + 2 errors generated. + +With older but supported versions of GCC, this is an unconditional hard error: + + drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'purge': + drivers/gpu/drm/msm/msm_gem_shrinker.c:105:35: error: parameter name omitted + purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) + ^~~~~~~~~~~~~~~~~~~~~~~ + drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'evict': + drivers/gpu/drm/msm/msm_gem_shrinker.c:117:35: error: parameter name omitted + evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) + ^~~~~~~~~~~~~~~~~~~~~~~ + +Restore the parameter name to clear up the warnings, renaming it +"unused" to make it clear it is only needed to satisfy the prototype of +drm_gem_lru_scan(). + +Cc: stable@vger.kernel.org +Fixes: 3392291fc509 ("drm/msm: Fix shrinker deadlock") +Signed-off-by: Nathan Chancellor +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c +index 6e39e4e578bba..8f118b5185a1d 100644 +--- a/drivers/gpu/drm/msm/msm_gem_shrinker.c ++++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c +@@ -102,7 +102,7 @@ with_vm_locks(void (*fn)(struct drm_gem_object *obj), + } + + static bool +-purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) ++purge(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) + { + if (!is_purgeable(to_msm_bo(obj))) + return false; +@@ -114,7 +114,7 @@ purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) + } + + static bool +-evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) ++evict(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) + { + if (is_unevictable(to_msm_bo(obj))) + return false; +-- +2.53.0 + diff --git a/queue-6.18/series b/queue-6.18/series index fcc22b528a..aff04c0ac7 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -374,3 +374,4 @@ net-gro-don-t-merge-zcopy-skbs.patch io_uring-nop-pass-all-errors-to-userspace.patch ksmbd-fix-durable-reconnect-error-path-file-lifetime.patch loongarch-kprobes-fix-handling-of-fatal-unrecoverabl.patch +drm-msm-restore-second-parameter-name-in-purge-and-e.patch diff --git a/queue-7.0/drm-msm-restore-second-parameter-name-in-purge-and-e.patch b/queue-7.0/drm-msm-restore-second-parameter-name-in-purge-and-e.patch new file mode 100644 index 0000000000..6998207820 --- /dev/null +++ b/queue-7.0/drm-msm-restore-second-parameter-name-in-purge-and-e.patch @@ -0,0 +1,69 @@ +From 9b4a55dd10c1b10c635a87373bab8c709039dccb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 May 2026 15:17:14 -0700 +Subject: drm/msm: Restore second parameter name in purge() and evict() + +From: Nathan Chancellor + +[ Upstream commit 53676e4d44d6b38c8a0d9bff331f170ae2e41bbe ] + +After commit 3392291fc509 ("drm/msm: Fix shrinker deadlock"), all +supported versions of clang warn (or error with CONFIG_WERROR=y): + + drivers/gpu/drm/msm/msm_gem_shrinker.c:105:58: error: omitting the parameter name in a function definition is a C23 extension [-Werror,-Wc23-extensions] + 105 | purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) + | ^ + drivers/gpu/drm/msm/msm_gem_shrinker.c:117:58: error: omitting the parameter name in a function definition is a C23 extension [-Werror,-Wc23-extensions] + 117 | evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) + | ^ + 2 errors generated. + +With older but supported versions of GCC, this is an unconditional hard error: + + drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'purge': + drivers/gpu/drm/msm/msm_gem_shrinker.c:105:35: error: parameter name omitted + purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) + ^~~~~~~~~~~~~~~~~~~~~~~ + drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'evict': + drivers/gpu/drm/msm/msm_gem_shrinker.c:117:35: error: parameter name omitted + evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) + ^~~~~~~~~~~~~~~~~~~~~~~ + +Restore the parameter name to clear up the warnings, renaming it +"unused" to make it clear it is only needed to satisfy the prototype of +drm_gem_lru_scan(). + +Cc: stable@vger.kernel.org +Fixes: 3392291fc509 ("drm/msm: Fix shrinker deadlock") +Signed-off-by: Nathan Chancellor +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c +index c8dda2b68cff2..9d2788f79acee 100644 +--- a/drivers/gpu/drm/msm/msm_gem_shrinker.c ++++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c +@@ -102,7 +102,7 @@ with_vm_locks(void (*fn)(struct drm_gem_object *obj), + } + + static bool +-purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) ++purge(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) + { + if (!is_purgeable(to_msm_bo(obj))) + return false; +@@ -114,7 +114,7 @@ purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) + } + + static bool +-evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) ++evict(struct drm_gem_object *obj, struct ww_acquire_ctx *unused) + { + if (is_unevictable(to_msm_bo(obj))) + return false; +-- +2.53.0 + diff --git a/queue-7.0/series b/queue-7.0/series index 8debe2a55e..a52e102e96 100644 --- a/queue-7.0/series +++ b/queue-7.0/series @@ -458,3 +458,4 @@ loongarch-kprobes-fix-handling-of-fatal-unrecoverabl.patch block-avoid-use-after-free-in-disk_free_zone_resourc.patch documentation-laptops-update-documentation-for-uniwi.patch platform-x86-uniwill-laptop-do-not-enable-the-chargi.patch +drm-msm-restore-second-parameter-name-in-purge-and-e.patch