2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Stanislaw Gruszka <[email protected]> commit 2e725a065b0153f0c449318da1923a120477633d upstream. Currently we return 0 in swsusp_alloc() when alloc_image_page() fails. Fix that. Also remove unneeded "error" variable since the only useful value of error is -ENOMEM. [rjw: Fixed up the changelog and changed subject.] Signed-off-by: Stanislaw Gruszka <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- kernel/power/snapshot.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) Index: linux-2.6.35.y/kernel/power/snapshot.c =================================================================== --- linux-2.6.35.y.orig/kernel/power/snapshot.c 2011-03-29 22:51:16.709295620 -0700 +++ linux-2.6.35.y/kernel/power/snapshot.c 2011-03-29 23:53:44.733393061 -0700 @@ -1512,11 +1512,8 @@ swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, unsigned int nr_pages, unsigned int nr_highmem) { - int error = 0; - if (nr_highmem > 0) { - error = get_highmem_buffer(PG_ANY); - if (error) + if (get_highmem_buffer(PG_ANY)) goto err_out; if (nr_highmem > alloc_highmem) { nr_highmem -= alloc_highmem; @@ -1539,7 +1536,7 @@ err_out: swsusp_free(); - return error; + return -ENOMEM; } asmlinkage int swsusp_save(void) _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
