path: root/init
diff options
authorRafael J. Wysocki <>2010-03-05 13:42:13 -0800
committerLinus Torvalds <>2010-03-06 11:26:26 -0800
commit452aa6999e6703ffbddd7f6ea124d3968915f3e3 (patch)
tree48e375fdb60920675f68b444b462903ad8bb6940 /init
parentad2bd7e0e9647cd48593a6b3a2be07dc2c2d28ed (diff)
mm/pm: force GFP_NOIO during suspend/hibernation and resume
There are quite a few GFP_KERNEL memory allocations made during suspend/hibernation and resume that may cause the system to hang, because the I/O operations they depend on cannot be completed due to the underlying devices being suspended. Avoid this problem by clearing the __GFP_IO and __GFP_FS bits in gfp_allowed_mask before suspend/hibernation and restoring the original values of these bits in gfp_allowed_mask durig the subsequent resume. [ fix CONFIG_PM=n linkage] Signed-off-by: Rafael J. Wysocki <> Reported-by: Maxim Levitsky <> Cc: Sebastian Ott <> Cc: Benjamin Herrenschmidt <> Cc: KOSAKI Motohiro <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'init')
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 40aaa020cd68..41d0f10dbbc7 100644
--- a/init/main.c
+++ b/init/main.c
@@ -618,7 +618,7 @@ asmlinkage void __init start_kernel(void)
/* Interrupts are enabled now so all GFP allocations are safe. */
- set_gfp_allowed_mask(__GFP_BITS_MASK);
+ gfp_allowed_mask = __GFP_BITS_MASK;