diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-05 02:35:43 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-05 02:35:43 (GMT) |
commit | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (patch) | |
tree | c08e1c0357fde481a16489b77feb8f6073faf538 /kernel/hung_task.c | |
parent | 1d5783030a14d1b6ee763f63c8136e581f48b365 (diff) | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
download | linux-fsl-qoriq-117ff42fd43e92d24c6aa6f3e4f0f1e1edada140.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/hung_task.c')
-rw-r--r-- | kernel/hung_task.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/kernel/hung_task.c b/kernel/hung_task.c index 8b1748d..2e48ec0 100644 --- a/kernel/hung_task.c +++ b/kernel/hung_task.c @@ -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) { |