Merge Christoph's freeze cleanup patch

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;