Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eac915d authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds
Browse files

[PATCH] mm: gfp_atomic comments 



Clarify in comments that GFP_ATOMIC means both "don't sleep" and "use
emergency pools", hence both ALLOC_HARDER and ALLOC_HIGH.

Signed-off-by: default avatarPaul Jackson <pj@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7365f3d1

include/linux/gfp.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct vm_area_struct; 
			__GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \

			__GFP_NOMEMALLOC|__GFP_HARDWALL)



/* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */

#define GFP_ATOMIC	(__GFP_HIGH)

#define GFP_NOIO	(__GFP_WAIT)

#define GFP_NOFS	(__GFP_WAIT | __GFP_IO)

mm/page_alloc.c

+2 −1
Original line number Diff line number Diff line
@@ -931,7 +931,8 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, 
	 *

	 * The caller may dip into page reserves a bit more if the caller

	 * cannot run direct reclaim, or if the caller has realtime scheduling

	 * policy.

	 * policy or is asking for __GFP_HIGH memory.  GFP_ATOMIC requests will

	 * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).

	 */

	alloc_flags = ALLOC_WMARK_MIN;

	if ((unlikely(rt_task(p)) && !in_interrupt()) || !wait)