From 11d010c6805cc2a4a9211d71509d6502b5976f6e Mon Sep 17 00:00:00 2001
From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Date: Sat, 3 Sep 2005 15:57:02 -0700
Subject: [PATCH] --- yaml --- r: 7001 b: refs/heads/master c:
 56057e1a128a9aab516350500e5b154e70577929 h: refs/heads/master i:   6999:
 f37101b009126229dded3e123e2c3bb17c9091e1 v: v3

---
 [refs]                      |  2 +-
 trunk/kernel/power/swsusp.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 5dae17d5813d..41cdd857759a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46dacba52a19d1414ba249499a48382c16242d99
+refs/heads/master: 56057e1a128a9aab516350500e5b154e70577929
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index b041cea2e878..1681e8a3fe51 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -737,18 +737,7 @@ static void copy_data_pages(void)
 
 static int calc_nr(int nr_copy)
 {
-	int extra = 0;
-	int mod = !!(nr_copy % PBES_PER_PAGE);
-	int diff = (nr_copy / PBES_PER_PAGE) + mod;
-
-	do {
-		extra += diff;
-		nr_copy += diff;
-		mod = !!(nr_copy % PBES_PER_PAGE);
-		diff = (nr_copy / PBES_PER_PAGE) + mod - extra;
-	} while (diff > 0);
-
-	return nr_copy;
+	return nr_copy + (nr_copy+PBES_PER_PAGE-2)/(PBES_PER_PAGE-1);
 }
 
 /**