aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/gfp.h1
-rw-r--r--mm/page_alloc.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 8b2eab90abb6..da7ce8730e97 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -57,6 +57,7 @@ struct vm_area_struct;
57 __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \ 57 __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \
58 __GFP_NOMEMALLOC|__GFP_HARDWALL) 58 __GFP_NOMEMALLOC|__GFP_HARDWALL)
59 59
60/* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */
60#define GFP_ATOMIC (__GFP_HIGH) 61#define GFP_ATOMIC (__GFP_HIGH)
61#define GFP_NOIO (__GFP_WAIT) 62#define GFP_NOIO (__GFP_WAIT)
62#define GFP_NOFS (__GFP_WAIT | __GFP_IO) 63#define GFP_NOFS (__GFP_WAIT | __GFP_IO)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ce991b173aa9..d41a0662d4da 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -931,7 +931,8 @@ restart:
931 * 931 *
932 * The caller may dip into page reserves a bit more if the caller 932 * The caller may dip into page reserves a bit more if the caller
933 * cannot run direct reclaim, or if the caller has realtime scheduling 933 * cannot run direct reclaim, or if the caller has realtime scheduling
934 * policy. 934 * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will
935 * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).
935 */ 936 */
936 alloc_flags = ALLOC_WMARK_MIN; 937 alloc_flags = ALLOC_WMARK_MIN;
937 if ((unlikely(rt_task(p)) && !in_interrupt()) || !wait) 938 if ((unlikely(rt_task(p)) && !in_interrupt()) || !wait)