---

yaml --- r: 42716 b: refs/heads/master c: 8357376 h: refs/heads/master v: v3
git-mirror · Dec 7, 2006 · 7e38167 · 7e38167
1 parent e0bef32
commit 7e38167
Show file tree

Hide file tree

Showing 8 changed files with 681 additions and 243 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf73bae6ba0dc4bd4f1e570feb34a06b72725af6
+refs/heads/master: 8357376d3df21b7d6f857931a57ac50da9c66e26
diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h
@@ -9,10 +9,13 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 
-/* page backup entry */
+/* struct pbe is used for creating lists of pages that should be restored
+ * atomically during the resume from disk, because the page frames they have
+ * occupied before the suspend are in use.
+ */
 struct pbe {
-	unsigned long address;		/* address of the copy */
-	unsigned long orig_address;	/* original address of page */
+	void *address;		/* address of the copy */
+	void *orig_address;	/* original address of a page */
 	struct pbe *next;
 };
 

diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h
@@ -103,8 +103,8 @@ struct snapshot_handle {
 extern unsigned int snapshot_additional_pages(struct zone *zone);
 extern int snapshot_read_next(struct snapshot_handle *handle, size_t count);
 extern int snapshot_write_next(struct snapshot_handle *handle, size_t count);
+extern void snapshot_write_finalize(struct snapshot_handle *handle);
 extern int snapshot_image_loaded(struct snapshot_handle *handle);
-extern void snapshot_free_unused_memory(struct snapshot_handle *handle);
 
 /*
  * This structure is used to pass the values needed for the identification