diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 00:51:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 00:51:14 +0100 |
| commit | 7787d2c2f440cc7854bed3d039bf4cc59d9e7897 (patch) | |
| tree | d7402ea46b2aa0a4d049e8edc61a302bda4db4d5 /include | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | PM / Hibernate: Fix memory corruption related to swap (diff) | |
| download | linux-7787d2c2f440cc7854bed3d039bf4cc59d9e7897.tar.xz linux-7787d2c2f440cc7854bed3d039bf4cc59d9e7897.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: Fix memory corruption related to swap
PM / Hibernate: Use async I/O when reading compressed hibernation image
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gfp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index e8713d55360a..f54adfcbec9c 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -360,7 +360,7 @@ void drain_local_pages(void *dummy); extern gfp_t gfp_allowed_mask; -extern void set_gfp_allowed_mask(gfp_t mask); -extern gfp_t clear_gfp_allowed_mask(gfp_t mask); +extern void pm_restrict_gfp_mask(void); +extern void pm_restore_gfp_mask(void); #endif /* __LINUX_GFP_H */ |