Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: Fix free_unnecessary_pages()
Janven · Jul 7, 2011 · 31cb852 · 31cb852
2 parents 2a9d6df + 4d4cf23
commit 31cb852
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
@@ -1211,7 +1211,11 @@ static void free_unnecessary_pages(void)
 		to_free_highmem = alloc_highmem - save;
 	} else {
 		to_free_highmem = 0;
-		to_free_normal -= save - alloc_highmem;
+		save -= alloc_highmem;
+		if (to_free_normal > save)
+			to_free_normal -= save;
+		else
+			to_free_normal = 0;
 	}
 
 	memory_bm_position_reset(&copy_bm);