aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/softlockup.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 1a07f8ca4b92..cb838ee93a82 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -180,10 +180,6 @@ static void check_hung_task(struct task_struct *t, unsigned long now)
180 if (t->flags & PF_FROZEN) 180 if (t->flags & PF_FROZEN)
181 return; 181 return;
182 182
183 /* Don't check for tasks waiting on network file systems like NFS */
184 if (t->state & TASK_KILLABLE)
185 return;
186
187 if (switch_count != t->last_switch_count || !t->last_switch_timestamp) { 183 if (switch_count != t->last_switch_count || !t->last_switch_timestamp) {
188 t->last_switch_count = switch_count; 184 t->last_switch_count = switch_count;
189 t->last_switch_timestamp = now; 185 t->last_switch_timestamp = now;
@@ -237,7 +233,8 @@ static void check_hung_uninterruptible_tasks(int this_cpu)
237 do_each_thread(g, t) { 233 do_each_thread(g, t) {
238 if (!--max_count) 234 if (!--max_count)
239 goto unlock; 235 goto unlock;
240 if (t->state & TASK_UNINTERRUPTIBLE) 236 /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */
237 if (t->state == TASK_UNINTERRUPTIBLE)
241 check_hung_task(t, now); 238 check_hung_task(t, now);
242 } while_each_thread(g, t); 239 } while_each_thread(g, t);
243 unlock: 240 unlock: