diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /kernel/softlockup.c | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'kernel/softlockup.c')
| -rw-r--r-- | kernel/softlockup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index b75b492fbfcf..cb838ee93a82 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -233,7 +233,8 @@ static void check_hung_uninterruptible_tasks(int this_cpu) | |||
| 233 | do_each_thread(g, t) { | 233 | do_each_thread(g, t) { |
| 234 | if (!--max_count) | 234 | if (!--max_count) |
| 235 | goto unlock; | 235 | goto unlock; |
| 236 | if (t->state & TASK_UNINTERRUPTIBLE) | 236 | /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ |
| 237 | if (t->state == TASK_UNINTERRUPTIBLE) | ||
| 237 | check_hung_task(t, now); | 238 | check_hung_task(t, now); |
| 238 | } while_each_thread(g, t); | 239 | } while_each_thread(g, t); |
| 239 | unlock: | 240 | unlock: |