From 3864f8450644b53419ca3b3a006d56a9c2ee0b10 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sat, 30 Aug 2008 21:08:40 +0400 Subject: [PATCH] --- yaml --- r: 109370 b: refs/heads/master c: cbaed698f37494b30b2449b51c728ae48630cb2b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/softlockup.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 02850cc93bf3..bf90d2096542 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6781f4ae30bbb8ebf31187b3c9304be16966f5a0 +refs/heads/master: cbaed698f37494b30b2449b51c728ae48630cb2b diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c index 1a07f8ca4b92..cb838ee93a82 100644 --- a/trunk/kernel/softlockup.c +++ b/trunk/kernel/softlockup.c @@ -180,10 +180,6 @@ static void check_hung_task(struct task_struct *t, unsigned long now) if (t->flags & PF_FROZEN) return; - /* Don't check for tasks waiting on network file systems like NFS */ - if (t->state & TASK_KILLABLE) - return; - if (switch_count != t->last_switch_count || !t->last_switch_timestamp) { t->last_switch_count = switch_count; t->last_switch_timestamp = now; @@ -237,7 +233,8 @@ static void check_hung_uninterruptible_tasks(int this_cpu) do_each_thread(g, t) { if (!--max_count) goto unlock; - if (t->state & TASK_UNINTERRUPTIBLE) + /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ + if (t->state == TASK_UNINTERRUPTIBLE) check_hung_task(t, now); } while_each_thread(g, t); unlock: