Merge branch 'work'

[linux-2.6-omap-h63xx.git] / include / linux / suspend.h

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index ad15a54806d8134342d195e7b120e11fb584f7ac..5dc94e777fab926d408477dbea464a3c78bcd3fd 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) \
@@ -71,7 +67,12 @@ void restore_processor_state(void);
 struct saved_context;
 void __save_processor_state(struct saved_context *ctxt);
 void __restore_processor_state(struct saved_context *ctxt);
-extern unsigned long get_usable_page(unsigned gfp_mask);
-extern void free_eaten_memory(void);
+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   1024
 
 #endif /* _LINUX_SWSUSP_H */