[PATCH] swsusp: introduce the swap map structure

[pandora-kernel.git] / kernel / power / power.h

diff --git a/kernel/power/power.h b/kernel/power/power.h
index d4fd96a..977877c 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -9,19 +9,14 @@
 #define SUSPEND_CONSOLE        (MAX_NR_CONSOLES-1)
 #endif
 
-#define MAX_PBES       ((PAGE_SIZE - sizeof(struct new_utsname) \
-                       - 4 - 3*sizeof(unsigned long) - sizeof(int) \
-                       - sizeof(void *)) / sizeof(swp_entry_t))
-
 struct swsusp_info {
        struct new_utsname      uts;
        u32                     version_code;
        unsigned long           num_physpages;
        int                     cpus;
        unsigned long           image_pages;
-       unsigned long           pagedir_pages;
-       suspend_pagedir_t       * suspend_pagedir;
-       swp_entry_t             pagedir[MAX_PBES];
+       unsigned long           pages;
+       swp_entry_t             start;
 } __attribute__((aligned(PAGE_SIZE)));
 
 
@@ -65,8 +60,10 @@ extern suspend_pagedir_t *pagedir_save;
 extern asmlinkage int swsusp_arch_suspend(void);
 extern asmlinkage int swsusp_arch_resume(void);
 
-extern int restore_highmem(void);
-extern struct pbe * alloc_pagedir(unsigned nr_pages);
-extern void create_pbe_list(struct pbe *pblist, unsigned nr_pages);
+extern void free_pagedir(struct pbe *pblist);
+extern struct pbe *alloc_pagedir(unsigned nr_pages, gfp_t gfp_mask, int safe_needed);
 extern void swsusp_free(void);
-extern int enough_swap(unsigned nr_pages);
+extern int alloc_data_pages(struct pbe *pblist, gfp_t gfp_mask, int safe_needed);
+extern unsigned int snapshot_nr_pages(void);
+extern struct pbe *snapshot_pblist(void);
+extern void snapshot_pblist_set(struct pbe *pblist);