X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fpdflush.c;h=8ce0900dc95ce13052ee6241f7cf6de91f828a8a;hb=60b59beafba875aef6d378078bce0baf2287ae14;hp=df7e50b8f70c1350a404d446a62e0845b6235bf1;hpb=816724e65c72a90a44fbad0ef0b59b186c85fa90;p=powerpc.git

diff --git a/mm/pdflush.c b/mm/pdflush.c
index df7e50b8f7..8ce0900dc9 100644
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -21,6 +21,7 @@
 #include <linux/writeback.h>	// Prototypes pdflush_operation()
 #include <linux/kthread.h>
 #include <linux/cpuset.h>
+#include <linux/freezer.h>
 
 
 /*
@@ -104,21 +105,20 @@ static int __pdflush(struct pdflush_work *my_work)
 		list_move(&my_work->list, &pdflush_list);
 		my_work->when_i_went_to_sleep = jiffies;
 		spin_unlock_irq(&pdflush_lock);
-
 		schedule();
-		if (try_to_freeze()) {
-			spin_lock_irq(&pdflush_lock);
-			continue;
-		}
-
+		try_to_freeze();
 		spin_lock_irq(&pdflush_lock);
 		if (!list_empty(&my_work->list)) {
-			printk("pdflush: bogus wakeup!\n");
+			/*
+			 * Someone woke us up, but without removing our control
+			 * structure from the global list.  swsusp will do this
+			 * in try_to_freeze()->refrigerator().  Handle it.
+			 */
 			my_work->fn = NULL;
 			continue;
 		}
 		if (my_work->fn == NULL) {
-			printk("pdflush: NULL work function\n");
+			printk("pdflush: bogus wakeup\n");
 			continue;
 		}
 		spin_unlock_irq(&pdflush_lock);