projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/nouveau: Don't take dev->struct_mutex in ttm_fini
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
exit.c
diff --git
a/kernel/exit.c
b/kernel/exit.c
index 22fcc05dec4022fa54f2507cb13eddf2137abacc..031325e9acf90a0d87184fd3ed0acc5e0ec0b956 100644
(file)
--- a/
kernel/exit.c
+++ b/
kernel/exit.c
@@
-436,7
+436,7
@@
static void exit_mm(struct task_struct *tsk)
mm_update_next_owner(mm);
mmput(mm);
if (test_thread_flag(TIF_MEMDIE))
mm_update_next_owner(mm);
mmput(mm);
if (test_thread_flag(TIF_MEMDIE))
-
unmark
_oom_victim();
+
exit
_oom_victim();
}
static struct task_struct *find_alive_thread(struct task_struct *p)
}
static struct task_struct *find_alive_thread(struct task_struct *p)
@@
-711,10
+711,10
@@
void do_exit(long code)
current->comm, task_pid_nr(current),
preempt_count());
current->comm, task_pid_nr(current),
preempt_count());
- acct_update_integrals(tsk);
/* sync mm's RSS info before statistics gathering */
if (tsk->mm)
sync_mm_rss(tsk->mm);
/* sync mm's RSS info before statistics gathering */
if (tsk->mm)
sync_mm_rss(tsk->mm);
+ acct_update_integrals(tsk);
group_dead = atomic_dec_and_test(&tsk->signal->live);
if (group_dead) {
hrtimer_cancel(&tsk->signal->real_timer);
group_dead = atomic_dec_and_test(&tsk->signal->live);
if (group_dead) {
hrtimer_cancel(&tsk->signal->real_timer);