diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-05-06 17:50:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:59 -0400 |
commit | 74dfd666de861c97d47bdbd892f6d21b801d0247 (patch) | |
tree | 7200946212cf546f4e5fac31db3dc97dbb144300 /kernel/power/user.c | |
parent | 7be9823491ecbaf9700d7d3502cb4b4dd0ed868a (diff) |
swsusp: do not use page flags
Make swsusp use memory bitmaps instead of page flags for marking 'nosave' and
free pages. This allows us to 'recycle' two page flags that can be used for
other purposes. Also, the memory needed to store the bitmaps is allocated
when necessary (ie. before the suspend) and freed after the resume which is
more reasonable.
The patch is designed to minimize the amount of changes and there are some
nice simplifications and optimizations possible on top of it. I am going to
implement them separately in the future.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power/user.c')
-rw-r--r-- | kernel/power/user.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 7cf6713b2325..845acd84cb23 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
@@ -52,6 +52,9 @@ static int snapshot_open(struct inode *inode, struct file *filp) | |||
52 | if ((filp->f_flags & O_ACCMODE) == O_RDWR) | 52 | if ((filp->f_flags & O_ACCMODE) == O_RDWR) |
53 | return -ENOSYS; | 53 | return -ENOSYS; |
54 | 54 | ||
55 | if(create_basic_memory_bitmaps()) | ||
56 | return -ENOMEM; | ||
57 | |||
55 | nonseekable_open(inode, filp); | 58 | nonseekable_open(inode, filp); |
56 | data = &snapshot_state; | 59 | data = &snapshot_state; |
57 | filp->private_data = data; | 60 | filp->private_data = data; |
@@ -77,6 +80,7 @@ static int snapshot_release(struct inode *inode, struct file *filp) | |||
77 | struct snapshot_data *data; | 80 | struct snapshot_data *data; |
78 | 81 | ||
79 | swsusp_free(); | 82 | swsusp_free(); |
83 | free_basic_memory_bitmaps(); | ||
80 | data = filp->private_data; | 84 | data = filp->private_data; |
81 | free_all_swap_pages(data->swap, data->bitmap); | 85 | free_all_swap_pages(data->swap, data->bitmap); |
82 | free_bitmap(data->bitmap); | 86 | free_bitmap(data->bitmap); |