X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fpower%2Fsnapshot.c;h=a686590d88c1b5def265e84aa9ab9091c4b07290;hb=3864e8ccbba1dcdea87398ab80fdc8ae0fab7c45;hp=59fb89ba9a4d9d0af0e08e8569cac46b908e7cc8;hpb=940d67f6b95166475ff6e600ef7658e1cd441278;p=~andy%2Flinux

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 59fb89ba9a4..a686590d88c 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -709,7 +709,8 @@ static void mark_nosave_pages(struct memory_bitmap *bm)
 				region->end_pfn << PAGE_SHIFT);
 
 		for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
-			memory_bm_set_bit(bm, pfn);
+			if (pfn_valid(pfn))
+				memory_bm_set_bit(bm, pfn);
 	}
 }
 
@@ -1233,7 +1234,7 @@ asmlinkage int swsusp_save(void)
 	nr_copy_pages = nr_pages;
 	nr_meta_pages = DIV_ROUND_UP(nr_pages * sizeof(long), PAGE_SIZE);
 
-	printk("swsusp: critical section/: done (%d pages copied)\n", nr_pages);
+	printk("swsusp: critical section: done (%d pages copied)\n", nr_pages);
 
 	return 0;
 }