From 84a26dcac60cafdeefd69a7202ddbecef5c599a2 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 25 Jun 2005 14:55:12 -0700
Subject: [PATCH] --- yaml --- r: 3249 b: refs/heads/master c:
 8f9bdf15c059c5d84db9c395705bf79b30762420 h: refs/heads/master i:   3247:
 db1ed536c4219ddffa5dff052b9f7196b75b596c v: v3

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

diff --git a/[refs] b/[refs]
index 64b70bcfbfd0..1f9ce0382e52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 620b03276488c3cf103caf1e326bd21f00d3df84
+refs/heads/master: 8f9bdf15c059c5d84db9c395705bf79b30762420
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index 339b5c3735bd..7747a8c43e84 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -929,21 +929,6 @@ int swsusp_resume(void)
 	return error;
 }
 
-/* More restore stuff */
-
-/*
- * Returns true if given address/order collides with any orig_address 
- */
-static int does_collide_order(unsigned long addr, int order)
-{
-	int i;
-	
-	for (i=0; i < (1<<order); i++)
-		if (!PageNosaveFree(virt_to_page(addr + i * PAGE_SIZE)))
-			return 1;
-	return 0;
-}
-
 /**
  *	On resume, for storing the PBE list and the image,
  *	we can only use memory pages that do not conflict with the pages
@@ -973,7 +958,7 @@ static unsigned long get_usable_page(unsigned gfp_mask)
 	unsigned long m;
 
 	m = get_zeroed_page(gfp_mask);
-	while (does_collide_order(m, 0)) {
+	while (!PageNosaveFree(virt_to_page(m))) {
 		eat_page((void *)m);
 		m = get_zeroed_page(gfp_mask);
 		if (!m)
@@ -1061,7 +1046,7 @@ static struct pbe * swsusp_pagedir_relocate(struct pbe *pblist)
 	/* Relocate colliding pages */
 
 	for_each_pb_page (pbpage, pblist) {
-		if (does_collide_order((unsigned long)pbpage, 0)) {
+		if (!PageNosaveFree(virt_to_page((unsigned long)pbpage))) {
 			m = (void *)get_usable_page(GFP_ATOMIC | __GFP_COLD);
 			if (!m) {
 				error = -ENOMEM;