aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.15
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/backport-5.15')
-rw-r--r--target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch2
-rw-r--r--target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch31
2 files changed, 1 insertions, 32 deletions
diff --git a/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch b/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch
index cf5b8f0e9f..8ee032fb0f 100644
--- a/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch
@@ -116,7 +116,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
extern spinlock_t css_set_lock;
#define task_css_set_check(task, __c) \
rcu_dereference_check((task)->cgroups, \
-@@ -708,6 +719,8 @@ struct cgroup;
+@@ -709,6 +720,8 @@ struct cgroup;
static inline u64 cgroup_id(const struct cgroup *cgrp) { return 1; }
static inline void css_get(struct cgroup_subsys_state *css) {}
static inline void css_put(struct cgroup_subsys_state *css) {}
diff --git a/target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch b/target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch
deleted file mode 100644
index 674740eaac..0000000000
--- a/target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 16c572ef0646f8b0fa19fbf81b302de8a03127f2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 24 Sep 2023 14:30:44 -0400
-Subject: Fix up backport of 136191703038 ("interconnect: Teach lockdep about
- icc_bw_lock order")
-
-Add a missing include to fix the following build error:
-
-drivers/interconnect/core.c: In function 'icc_init':
-drivers/interconnect/core.c:1148:9: error: implicit declaration of function 'fs_reclaim_acquire' [-Werror=implicit-function-declaration]
- 1148 | fs_reclaim_acquire(GFP_KERNEL);
- | ^~~~~~~~~~~~~~~~~~
-drivers/interconnect/core.c:1150:9: error: implicit declaration of function 'fs_reclaim_release' [-Werror=implicit-function-declaration]
- 1150 | fs_reclaim_release(GFP_KERNEL);
- | ^~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/interconnect/core.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/interconnect/core.c
-+++ b/drivers/interconnect/core.c
-@@ -13,6 +13,7 @@
- #include <linux/interconnect.h>
- #include <linux/interconnect-provider.h>
- #include <linux/list.h>
-+#include <linux/sched/mm.h>
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>