diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-01-06 09:17:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 17:33:43 +0100 |
commit | 277c6e2ad7369558dbd7ffbcc6dcbe16458bf723 (patch) | |
tree | 4b45284c5c5c13c41d2723f603ea3645d999ce54 /kernel/power/power.h | |
parent | [PATCH] swsusp: improve handling of swap partitions (diff) | |
download | linux-277c6e2ad7369558dbd7ffbcc6dcbe16458bf723.tar.xz linux-277c6e2ad7369558dbd7ffbcc6dcbe16458bf723.zip |
[PATCH] swsusp: save image header first
This makes the swsusp_info structure become the header of the image in the
literal sense (ie. it is saved to the swap and read before any other image
data with the help of the swsusp's swap map structure, so generally it is
treated in the same way as the rest of the image).
The main thing it does is to make swsusp_header contain the offset of the swap
map used to track the image data pages rather than the offset of swsusp_info.
Simultaneously, swsusp_info becomes the first image page written to the swap.
The other changes are generally consequences of the above with a few
exceptions (there's some consolidation in the image reading part as a few
functions turn into trivial wrappers around something else).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-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 'kernel/power/power.h')
-rw-r--r-- | kernel/power/power.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 273a5b1d70be..7e8492fd1423 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -16,7 +16,6 @@ struct swsusp_info { int cpus; unsigned long image_pages; unsigned long pages; - swp_entry_t start; } __attribute__((aligned(PAGE_SIZE))); |