diff --git a/[refs] b/[refs]
index 2b57307c67a9..f0f39d9b2f55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 249a6771afcdfaca0ac178f63343aff2c4dc2853
+refs/heads/master: 254b54771cc4c00002f796be65d2885191dca9dc
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index 1cc9ff25e479..8aef1b49150f 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -402,15 +402,14 @@ static int write_page(unsigned long addr, swp_entry_t * loc)
 static void data_free(void)
 {
 	swp_entry_t entry;
-	int i;
+	struct pbe * p;
 
-	for (i = 0; i < nr_copy_pages; i++) {
-		entry = (pagedir_nosave + i)->swap_address;
+	for_each_pbe(p, pagedir_nosave) {
+		entry = p->swap_address;
 		if (entry.val)
 			swap_free(entry);
 		else
 			break;
-		(pagedir_nosave + i)->swap_address = (swp_entry_t){0};
 	}
 }