---

yaml --- r: 7001 b: refs/heads/master c: 56057e1 h: refs/heads/master i: 6999: f37101b v: v3
git-mirror · Sep 5, 2005 · 11d010c · 11d010c
1 parent 3e2f7d4
commit 11d010c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -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);
 }
 
 /**