diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
| commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
| tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /kernel/power/power.h | |
| parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
| parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) | |
| download | kernel_samsung_tuna-31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97.zip kernel_samsung_tuna-31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97.tar.gz kernel_samsung_tuna-31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97.tar.bz2 | |
Merge ../linux-2.6
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index d4fd96a..6c042b5 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -65,8 +65,8 @@ 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 free_pagedir(struct pbe *pblist); +extern struct pbe *alloc_pagedir(unsigned nr_pages, gfp_t gfp_mask, int safe_needed); extern void create_pbe_list(struct pbe *pblist, unsigned nr_pages); 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); |