diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-01-14 23:26:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:26:28 -0800 |
| commit | f9adcf4ea1599e61743bccc5cabf35501e5ee51d (patch) | |
| tree | 4cf5db11ac0a3edc94c35258d06eff91247334fc /mm | |
| parent | 1bed67e3cbd9fa5d4bf3f3dda9dfb105e2bcea87 (diff) | |
| download | history-f9adcf4ea1599e61743bccc5cabf35501e5ee51d.tar.gz | |
[PATCH] swsusp: refrigerator cleanups
This patch is from Nigel's swsusp2, it kills ugly #include <suspend.h> from
all over the tree, and makes code slightly nicer. I only left those parts
that do not change any code.
From: Nigel Cunningham <ncunningham@linuxmail.org>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/pdflush.c | 4 | ||||
| -rw-r--r-- | mm/vmscan.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mm/pdflush.c b/mm/pdflush.c index 21b7f127b7d303..38ce279cc8cdf4 100644 --- a/mm/pdflush.c +++ b/mm/pdflush.c @@ -17,7 +17,6 @@ #include <linux/gfp.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/suspend.h> #include <linux/fs.h> // Needed by writeback.h #include <linux/writeback.h> // Prototypes pdflush_operation() #include <linux/kthread.h> @@ -106,8 +105,7 @@ static int __pdflush(struct pdflush_work *my_work) spin_unlock_irq(&pdflush_lock); schedule(); - if (current->flags & PF_FREEZE) { - refrigerator(PF_FREEZE); + if (try_to_freeze(PF_FREEZE)) { spin_lock_irq(&pdflush_lock); continue; } diff --git a/mm/vmscan.c b/mm/vmscan.c index 69217c5bb02de4..3c5a6567b3bcf5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -21,7 +21,6 @@ #include <linux/highmem.h> #include <linux/file.h> #include <linux/writeback.h> -#include <linux/suspend.h> #include <linux/blkdev.h> #include <linux/buffer_head.h> /* for try_to_release_page(), buffer_heads_over_limit */ |