Merge master.kernel.org:/home/rmk/linux-2.6-serial

[cascardo/linux.git] / include / linux / suspend.h

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index a61c04f..5dc94e7 100644 (file)
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -14,11 +14,7 @@
 typedef struct pbe {
        unsigned long address;          /* address of the copy */
        unsigned long orig_address;     /* original address of page */
-       swp_entry_t swap_address;       
-
-       struct pbe *next;       /* also used as scratch space at
-                                * end of page (see link, diskpage)
-                                */
+       struct pbe *next;
 } suspend_pagedir_t;
 
 #define for_each_pbe(pbe, pblist) \
@@ -77,6 +73,6 @@ unsigned long get_safe_page(gfp_t gfp_mask);
  * XXX: We try to keep some more pages free so that I/O operations succeed
  * without paging. Might this be more?
  */
-#define PAGES_FOR_IO   512
+#define PAGES_FOR_IO   1024
 
 #endif /* _LINUX_SWSUSP_H */