diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 17:16:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 17:16:53 -0700 |
| commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
| tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /mm | |
| parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
| parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
| download | linux-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.gz linux-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.bz2 linux-2031d0f586839bc68f35bcf8580b18947f8491d4.zip | |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/pdflush.c | 2 | ||||
| -rw-r--r-- | mm/vmscan.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/pdflush.c b/mm/pdflush.c index 38ce279cc8cd..d6781951267e 100644 --- a/mm/pdflush.c +++ b/mm/pdflush.c @@ -105,7 +105,7 @@ static int __pdflush(struct pdflush_work *my_work) spin_unlock_irq(&pdflush_lock); schedule(); - if (try_to_freeze(PF_FREEZE)) { + if (try_to_freeze()) { spin_lock_irq(&pdflush_lock); continue; } diff --git a/mm/vmscan.c b/mm/vmscan.c index 4b8e62a19370..1fa312a8db77 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1216,8 +1216,8 @@ static int kswapd(void *p) order = 0; for ( ; ; ) { unsigned long new_order; - if (current->flags & PF_FREEZE) - refrigerator(PF_FREEZE); + + try_to_freeze(); prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE); new_order = pgdat->kswapd_max_order; |