diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-12-15 16:02:19 +0100 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-12-15 16:13:02 +0100 |
| commit | 85f59c8e271f917835f1b97ab8afc8c7f148236f (patch) | |
| tree | 38dcdb27635c57a5469b8f313ed12c9815c66ecf /target | |
| parent | 314af7018a08a5a193b53848c9cd6a94f30a0055 (diff) | |
| download | openwrt-85f59c8e271f917835f1b97ab8afc8c7f148236f.tar.gz openwrt-85f59c8e271f917835f1b97ab8afc8c7f148236f.tar.bz2 openwrt-85f59c8e271f917835f1b97ab8afc8c7f148236f.zip | |
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 <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch | 6 |
1 files changed, 4 insertions, 2 deletions
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 <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); |