kernel: bump 6.1 to 6.1.80

[openwrt/staging/mans0n.git] / target / linux / generic / backport-6.1 / 020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch

diff --git a/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch b/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch
index b5051d71a476b945c8799fb7851c35404f54d60f..67fe4f96ec782569122a950a72b712e9d74f4df9 100644 (file)
--- a/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch
+++ b/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch
@@ -62,7 +62,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
 
 --- a/include/linux/mm_inline.h
 +++ b/include/linux/mm_inline.h
-@@ -595,4 +595,12 @@ pte_install_uffd_wp_if_needed(struct vm_
+@@ -600,4 +600,12 @@ pte_install_uffd_wp_if_needed(struct vm_
  #endif
  }
  
@@ -77,7 +77,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
  #endif
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1435,8 +1435,7 @@ again:
+@@ -1445,8 +1445,7 @@ again:
                                        force_flush = 1;
                                        set_page_dirty(page);
                                }
@@ -87,7 +87,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
                                        mark_page_accessed(page);
                        }
                        rss[mm_counter(page)]--;
-@@ -5170,8 +5169,8 @@ static inline void mm_account_fault(stru
+@@ -5219,8 +5218,8 @@ static inline void mm_account_fault(stru
  #ifdef CONFIG_LRU_GEN
  static void lru_gen_enter_fault(struct vm_area_struct *vma)
  {