diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /mm/page-writeback.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'mm/page-writeback.c')
| -rw-r--r-- | mm/page-writeback.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index a3b14090b1fb..2c5d79236ead 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -566,7 +566,8 @@ static void balance_dirty_pages(struct address_space *mapping, | |||
| 566 | if (pages_written >= write_chunk) | 566 | if (pages_written >= write_chunk) |
| 567 | break; /* We've done our duty */ | 567 | break; /* We've done our duty */ |
| 568 | 568 | ||
| 569 | schedule_timeout_interruptible(pause); | 569 | __set_current_state(TASK_INTERRUPTIBLE); |
| 570 | io_schedule_timeout(pause); | ||
| 570 | 571 | ||
| 571 | /* | 572 | /* |
| 572 | * Increase the delay for each loop, up to our previous | 573 | * Increase the delay for each loop, up to our previous |