Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h

1 files changed, 8 insertions, 10 deletions

diff --git a/mm/pdflush.c b/mm/pdflush.c
index c4b6d0afd736..b02102feeb4b 100644
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -104,21 +104,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);
@@ -202,8 +201,7 @@ int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0)
         unsigned long flags;
         int ret = 0;
 
-        if (fn == NULL)
-                BUG();          /* Hard to diagnose if it's deferred */
+        BUG_ON(fn == NULL);     /* Hard to diagnose if it's deferred */
 
         spin_lock_irqsave(&pdflush_lock, flags);
         if (list_empty(&pdflush_list)) {