kernel: bump 5.15 to 5.15.132

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch

diff --git a/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch b/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
index 5cd6e03dc60779dcf7bf2f56b32e78ca99df9150..40e51b4294a75a794741cf8e72ee35c40784d8a2 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
@@ -110,7 +110,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h
-@@ -442,6 +442,7 @@ static inline struct obj_cgroup *__page_
+@@ -447,6 +447,7 @@ static inline struct obj_cgroup *__page_
   * - LRU isolation
   * - lock_page_memcg()
   * - exclusive reference
@@ -118,7 +118,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
   *
   * For a kmem page a caller should hold an rcu read lock to protect memcg
   * associated with a kmem page from being released.
-@@ -497,6 +498,7 @@ static inline struct mem_cgroup *page_me
+@@ -502,6 +503,7 @@ static inline struct mem_cgroup *page_me
   * - LRU isolation
   * - lock_page_memcg()
   * - exclusive reference
@@ -126,7 +126,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
   *
   * For a kmem page a caller should hold an rcu read lock to protect memcg
   * associated with a kmem page from being released.
-@@ -953,6 +955,23 @@ void unlock_page_memcg(struct page *page
+@@ -958,6 +960,23 @@ void unlock_page_memcg(struct page *page
  
  void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val);
  
@@ -150,7 +150,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  /* idx can be of type enum memcg_stat_item or node_stat_item */
  static inline void mod_memcg_state(struct mem_cgroup *memcg,
                                   int idx, int val)
-@@ -1369,6 +1388,18 @@ static inline void unlock_page_memcg(str
+@@ -1374,6 +1393,18 @@ static inline void unlock_page_memcg(str
  {
  }