aboutsummaryrefslogtreecommitdiff
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <[email protected]>2016-04-25 15:44:01 +0200
committerRafael J. Wysocki <[email protected]>2016-04-25 15:44:01 +0200
commit1cbc99dfe5d7d686fd022647f4e489b5eb8e9068 (patch)
tree735e0254f6f491442d75e683eb9eb3c7ac685111 /kernel/exit.c
parent94862a62dfe3ba1c7601115a2dc80721c5b256f0 (diff)
parent8cee1eed8e78143aa2ed60308fb88e2d6fa46205 (diff)
Merge back cpufreq changes for v4.7.
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 10e088237fed..fd90195667e1 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -53,6 +53,7 @@
#include <linux/oom.h>
#include <linux/writeback.h>
#include <linux/shm.h>
+#include <linux/kcov.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
@@ -434,7 +435,7 @@ static void exit_mm(struct task_struct *tsk)
mm_update_next_owner(mm);
mmput(mm);
if (test_thread_flag(TIF_MEMDIE))
- exit_oom_victim();
+ exit_oom_victim(tsk);
}
static struct task_struct *find_alive_thread(struct task_struct *p)
@@ -655,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));