diff options
-rw-r--r-- | kernel/power/swsusp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index b041cea2e878..1681e8a3fe51 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c | |||
@@ -737,18 +737,7 @@ static void copy_data_pages(void) | |||
737 | 737 | ||
738 | static int calc_nr(int nr_copy) | 738 | static int calc_nr(int nr_copy) |
739 | { | 739 | { |
740 | int extra = 0; | 740 | return nr_copy + (nr_copy+PBES_PER_PAGE-2)/(PBES_PER_PAGE-1); |
741 | int mod = !!(nr_copy % PBES_PER_PAGE); | ||
742 | int diff = (nr_copy / PBES_PER_PAGE) + mod; | ||
743 | |||
744 | do { | ||
745 | extra += diff; | ||
746 | nr_copy += diff; | ||
747 | mod = !!(nr_copy % PBES_PER_PAGE); | ||
748 | diff = (nr_copy / PBES_PER_PAGE) + mod - extra; | ||
749 | } while (diff > 0); | ||
750 | |||
751 | return nr_copy; | ||
752 | } | 741 | } |
753 | 742 | ||
754 | /** | 743 | /** |