diff --git a/[refs] b/[refs] index 0de688f8613c..3251941967ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c87b74c72d42f7272aa4bf8f17c73bb53774eee +refs/heads/master: 57487f4376e16558ccbe45a5b41d8cb5192309a4 diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c index d967e875ee82..353f37f1ba28 100644 --- a/trunk/kernel/power/swsusp.c +++ b/trunk/kernel/power/swsusp.c @@ -918,6 +918,7 @@ static int swsusp_alloc(void) pagedir_nosave = NULL; nr_copy_pages = calc_nr(nr_copy_pages); + nr_copy_pages_check = nr_copy_pages; pr_debug("suspend: (pages needed: %d + %d free: %d)\n", nr_copy_pages, PAGES_FOR_IO, nr_free_pages()); @@ -940,7 +941,6 @@ static int swsusp_alloc(void) return error; } - nr_copy_pages_check = nr_copy_pages; return 0; }