Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280367
b: refs/heads/master
c: a585042
h: refs/heads/master
i:
  280365: 5281ff8
  280363: a6828d8
  280359: e2bf1b8
  280351: 07083be
v: v3
  • Loading branch information
Tejun Heo committed Nov 21, 2011
1 parent 0712288 commit e956e13
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5be2d0d1a8746e7be5210e3d6b904455000443c
refs/heads/master: a585042f7b933539a0b6bc63650c2d49ffb2e55d
3 changes: 1 addition & 2 deletions trunk/kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,6 @@ static void exit_mm(struct task_struct * tsk)
tsk->mm = NULL;
up_read(&mm->mmap_sem);
enter_lazy_tlb(mm, current);
/* We don't want this task to be frozen prematurely */
clear_freeze_flag(tsk);
task_unlock(tsk);
mm_update_next_owner(mm);
mmput(mm);
Expand Down Expand Up @@ -1040,6 +1038,7 @@ NORET_TYPE void do_exit(long code)
exit_rcu();
/* causes final put_task_struct in finish_task_switch(). */
tsk->state = TASK_DEAD;
tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */
schedule();
BUG();
/* Avoid "noreturn function does return". */
Expand Down
3 changes: 1 addition & 2 deletions trunk/kernel/power/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
static inline int freezable(struct task_struct * p)
{
if ((p == current) ||
(p->flags & PF_NOFREEZE) ||
(p->exit_state != 0))
(p->flags & PF_NOFREEZE))
return 0;
return 1;
}
Expand Down

0 comments on commit e956e13

Please sign in to comment.