projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86-64: Fix vmalloc_32 to really allocate <4GB on 64bit platforms
[powerpc.git]
/
mm
/
pdflush.c
diff --git
a/mm/pdflush.c
b/mm/pdflush.c
index
df7e50b
..
8ce0900
100644
(file)
--- 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/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);
list_move(&my_work->list, &pdflush_list);
my_work->when_i_went_to_sleep = jiffies;
spin_unlock_irq(&pdflush_lock);
-
schedule();
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)) {
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) {
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);
continue;
}
spin_unlock_irq(&pdflush_lock);