From: Christian Marangi Date: Fri, 15 Dec 2023 15:02:19 +0000 (+0100) Subject: generic: 6.1: fix list_count_nodes backport patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=85f59c8e271f917835f1b97ab8afc8c7f148236f;p=openwrt%2Fstaging%2Fjow.git generic: 6.1: fix list_count_nodes backport patch Commit 25746a3fa2da ("drm/i915: fix up merge with usb-next branch") was internally applied to the 5.15 patch but wasn0t applied to the backport for kernel 6.1. Apply the same treatement also there to fix compilation warning. Fixes: a14240d384af ("kernel: backport list_count_nodes()") Signed-off-by: Christian Marangi --- diff --git a/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch b/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch index 95dca93dd9..60a90136c9 100644 --- a/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch +++ b/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch @@ -38,11 +38,13 @@ Signed-off-by: Greg Kroah-Hartman void intel_execlists_dump_active_requests(struct intel_engine_cs *engine, struct i915_request *hung_rq, struct drm_printer *m) -@@ -4176,7 +4165,7 @@ void intel_execlists_dump_active_request +@@ -4175,8 +4164,8 @@ void intel_execlists_dump_active_request + intel_engine_dump_active_requests(&engine->sched_engine->requests, hung_rq, m); - drm_printf(m, "\tOn hold?: %lu\n", +- drm_printf(m, "\tOn hold?: %lu\n", - list_count(&engine->sched_engine->hold)); ++ drm_printf(m, "\tOn hold?: %zu\n", + list_count_nodes(&engine->sched_engine->hold)); spin_unlock_irqrestore(&engine->sched_engine->lock, flags);