Skip to content

Commit

Permalink
generic: 6.1: fix list_count_nodes backport patch
Browse files Browse the repository at this point in the history
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: a14240d ("kernel: backport list_count_nodes()")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  • Loading branch information
Ansuel committed Dec 15, 2023
1 parent 314af70 commit 85f59c8
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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);
Expand Down

0 comments on commit 85f59c8

Please sign in to comment.