Merge by hand (conflicts in sd.c)

[linux-2.6] / mm / pdflush.c

diff --git a/mm/pdflush.c b/mm/pdflush.c
index 38ce279cc8cdf4fa3a83e29a8ffb509a0551c447..d6781951267eb654a522529658aaa06199d1772f 100644 (file)
--- 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;
                }