diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-07-10 13:45:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 22:24:22 +0200 |
| commit | 712f403af6682c942d8ff8bfbd54eed03643a796 (patch) | |
| tree | fa5c018f024906a231f0c018a3639b977c0d4af6 /kernel/power/swap.c | |
| parent | [PATCH] swsusp: do not use memcpy for snapshotting memory (diff) | |
| download | linux-712f403af6682c942d8ff8bfbd54eed03643a796.tar.xz linux-712f403af6682c942d8ff8bfbd54eed03643a796.zip | |
[PATCH] swsusp warning fix
kernel/power/swap.c: In function 'swsusp_write':
kernel/power/swap.c:275: warning: 'start' may be used uninitialized in this function
gcc isn't smart enough, so help it.
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/power/swap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 044b8e0c1025..a57c661c7e8a 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -263,7 +263,6 @@ int swsusp_write(void) struct swap_map_handle handle; struct snapshot_handle snapshot; struct swsusp_info *header; - unsigned long start; int error; if ((error = swsusp_swap_check())) { @@ -281,16 +280,17 @@ int swsusp_write(void) } error = get_swap_writer(&handle); if (!error) { - start = handle.cur_swap; + unsigned long start = handle.cur_swap; error = swap_write_page(&handle, header); - } - if (!error) - error = save_image(&handle, &snapshot, header->pages - 1); - if (!error) { - flush_swap_writer(&handle); - printk("S"); - error = mark_swapfiles(swp_entry(root_swap, start)); - printk("|\n"); + if (!error) + error = save_image(&handle, &snapshot, + header->pages - 1); + if (!error) { + flush_swap_writer(&handle); + printk("S"); + error = mark_swapfiles(swp_entry(root_swap, start)); + printk("|\n"); + } } if (error) free_all_swap_pages(root_swap, handle.bitmap); |