History

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

Linus Torvalds committed 15 years ago

Commit 7787d2c2 parents 60658f8 c9e664f6 files · +68 −37Browse files

Showing the changes to include/linux (1 of 6 files). Show all

Unified · Split

include/linux/gfp.h+2−2
@@ -360,7 +360,7 @@ void drain_local_pages(void *dummy); · 359 unmodified lines
360360
361361 extern gfp_t gfp_allowed_mask;
362362
363−extern void set_gfp_allowed_mask(gfp_t mask);
364−extern gfp_t clear_gfp_allowed_mask(gfp_t mask);
363+extern void pm_restrict_gfp_mask(void);
364+extern void pm_restore_gfp_mask(void);
365365
366366 #endif /* __LINUX_GFP_H */