Merge tag 'trace-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[platform/kernel/linux-starfive.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index f2afdb0..34b90e2 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -68,6 +68,7 @@
 #include <linux/kprobes.h>
 #include <linux/rethook.h>
 #include <linux/sysfs.h>
+#include <linux/user_events.h>
 
 #include <linux/uaccess.h>
 #include <asm/unistd.h>
@@ -537,7 +538,7 @@ static void exit_mm(void)
                return;
        sync_mm_rss(mm);
        mmap_read_lock(mm);
-       mmgrab(mm);
+       mmgrab_lazy_tlb(mm);
        BUG_ON(mm != current->active_mm);
        /* more a memory barrier than a real lock */
        task_lock(current);
@@ -818,6 +819,7 @@ void __noreturn do_exit(long code)
 
        coredump_task_exit(tsk);
        ptrace_event(PTRACE_EVENT_EXIT, code);
+       user_events_exit(tsk);
 
        validate_creds_for_do_exit(tsk);