Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[cascardo/linux.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 07110c6..953d1a1 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -53,14 +53,13 @@
 #include <linux/oom.h>
 #include <linux/writeback.h>
 #include <linux/shm.h>
+#include <linux/kcov.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/pgtable.h>
 #include <asm/mmu_context.h>
 
-static void exit_mm(struct task_struct *tsk);
-
 static void __unhash_process(struct task_struct *p, bool group_dead)
 {
        nr_threads--;
@@ -657,6 +656,7 @@ void do_exit(long code)
        TASKS_RCU(int tasks_rcu_i);
 
        profile_task_exit(tsk);
+       kcov_task_exit(tsk);
 
        WARN_ON(blk_needs_flush_plug(tsk));
 
@@ -1120,8 +1120,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
 static int *task_stopped_code(struct task_struct *p, bool ptrace)
 {
        if (ptrace) {
-               if (task_is_stopped_or_traced(p) &&
-                   !(p->jobctl & JOBCTL_LISTENING))
+               if (task_is_traced(p) && !(p->jobctl & JOBCTL_LISTENING))
                        return &p->exit_code;
        } else {
                if (p->signal->flags & SIGNAL_STOP_STOPPED)