diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 10:06:11 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 10:06:11 -0500 |
| commit | 64357ed468025614d48daa6cc87674ae5616f8fb (patch) | |
| tree | 2467c239364d7602755b73203025d329c6f84b22 /kernel/hung_task.c | |
| parent | be404f0212ffa8f67361f8ee460a25d901d88991 (diff) | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'kernel/hung_task.c')
| -rw-r--r-- | kernel/hung_task.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hung_task.c b/kernel/hung_task.c index d4e841747400..0c642d51aac2 100644 --- a/kernel/hung_task.c +++ b/kernel/hung_task.c | |||
| @@ -144,7 +144,7 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout) | |||
| 144 | 144 | ||
| 145 | rcu_read_lock(); | 145 | rcu_read_lock(); |
| 146 | do_each_thread(g, t) { | 146 | do_each_thread(g, t) { |
| 147 | if (!--max_count) | 147 | if (!max_count--) |
| 148 | goto unlock; | 148 | goto unlock; |
| 149 | if (!--batch_count) { | 149 | if (!--batch_count) { |
| 150 | batch_count = HUNG_TASK_BATCHING; | 150 | batch_count = HUNG_TASK_BATCHING; |