Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277094
b: refs/heads/master
c: f9fab10
h: refs/heads/master
v: v3
  • Loading branch information
Mandeep Singh Baines authored and Linus Torvalds committed Jan 4, 2012
1 parent 32cb760 commit 36d3db6
Show file tree
Hide file tree
Showing 2 changed files with 11 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: 30e053248da178cf6154bb7e950dc8713567e3fa
refs/heads/master: f9fab10bbd768b0e5254e53a4a8477a94bfc4b96
14 changes: 10 additions & 4 deletions trunk/kernel/hung_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,17 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)

/*
* Ensure the task is not frozen.
* Also, when a freshly created task is scheduled once, changes
* its state to TASK_UNINTERRUPTIBLE without having ever been
* switched out once, it musn't be checked.
* Also, skip vfork and any other user process that freezer should skip.
*/
if (unlikely(t->flags & PF_FROZEN || !switch_count))
if (unlikely(t->flags & (PF_FROZEN | PF_FREEZER_SKIP)))
return;

/*
* When a freshly created task is scheduled once, changes its state to
* TASK_UNINTERRUPTIBLE without having ever been switched out once, it
* musn't be checked.
*/
if (unlikely(!switch_count))
return;

if (switch_count != t->last_switch_count) {
Expand Down

0 comments on commit 36d3db6

Please sign in to comment.