hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 22:44:27 -05:00
Code Issues Projects Releases Wiki Activity

generic: 6.1: fix list_count_nodes backport patch

Browse Source 
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: a14240d384 ("kernel: backport list_count_nodes()")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-12-15 16:02:19 +01:00
parent 314af7018a
commit 85f59c8e27
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch
View File

@ -38,11 +38,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
void intel_execlists_dump_active_requests(struct intel_engine_cs *engine, void intel_execlists_dump_active_requests(struct intel_engine_cs *engine,
struct i915_request *hung_rq, struct i915_request *hung_rq,
struct drm_printer *m) 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); 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)); - list_count(&engine->sched_engine->hold));
+ drm_printf(m, "\tOn hold?: %zu\n",
+ list_count_nodes(&engine->sched_engine->hold)); + list_count_nodes(&engine->sched_engine->hold));
spin_unlock_irqrestore(&engine->sched_engine->lock, flags); spin_unlock_irqrestore(&engine->sched_engine->lock, flags);