]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sync mm-stable with mm-hotfixes-stable to pick up depended-upon upstream changes
authorAndrew Morton <akpm@linux-foundation.org>
Sun, 16 Apr 2023 19:31:58 +0000 (12:31 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 16 Apr 2023 19:31:58 +0000 (12:31 -0700)
12 files changed:
1  2 
fs/userfaultfd.c
include/linux/mm_types.h
kernel/fork.c
lib/maple_tree.c
mm/huge_memory.c
mm/hugetlb.c
mm/khugepaged.c
mm/memory.c
mm/mmap.c
mm/mprotect.c
mm/swapfile.c
mm/vmalloc.c

Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/khugepaged.c
Simple merge
diff --cc mm/memory.c
Simple merge
diff --cc mm/mmap.c
index 511f656eb423827433ba103bbc8bf7b209b65f21,ff68a67a2a7c3477fa19c93d740a3f26617545b9..51cd747884e321a56d778df0b0c1af0bc6e0f7c5
+++ b/mm/mmap.c
@@@ -3069,8 -3037,9 +3069,9 @@@ void exit_mmap(struct mm_struct *mm
         */
        set_bit(MMF_OOM_SKIP, &mm->flags);
        mmap_write_lock(mm);
+       mt_clear_in_rcu(&mm->mm_mt);
        free_pgtables(&tlb, &mm->mm_mt, vma, FIRST_USER_ADDRESS,
 -                    USER_PGTABLES_CEILING);
 +                    USER_PGTABLES_CEILING, true);
        tlb_finish_mmu(&tlb);
  
        /*
diff --cc mm/mprotect.c
Simple merge
diff --cc mm/swapfile.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge