Commit 2d48366b authored Dec 12, 2014 by Jianyu Zhan Committed by Linus Torvalds Dec 13, 2014

mm, gfp: escalatedly define GFP_HIGHUSER and GFP_HIGHUSER_MOVABLE



GFP_USER, GFP_HIGHUSER and GFP_HIGHUSER_MOVABLE are escalatedly confined
defined, also implied by their names:

GFP_USER                                  = GFP_USER
GFP_USER + __GFP_HIGHMEM                  = GFP_HIGHUSER
GFP_USER + __GFP_HIGHMEM + __GFP_MOVABLE  = GFP_HIGHUSER_MOVABLE

So just make GFP_HIGHUSER and GFP_HIGHUSER_MOVABLE escalatedly defined to
reflect this fact.  It also makes the definition clear and texturally warn
on any furture break-up of this escalated relastionship.

Signed-off-by: Jianyu Zhan <jianyu.zhan@emc.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 66f2ca7e

include/linux/gfp.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -110,11 +110,8 @@ struct vm_area_struct;
		#define GFP_TEMPORARY (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| \
		__GFP_RECLAIMABLE)
		#define GFP_USER (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| __GFP_HARDWALL)
		#define GFP_HIGHUSER (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| __GFP_HARDWALL \| \
		__GFP_HIGHMEM)
		#define GFP_HIGHUSER_MOVABLE (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| \
		__GFP_HARDWALL \| __GFP_HIGHMEM \| \
		__GFP_MOVABLE)
		#define GFP_HIGHUSER (GFP_USER \| __GFP_HIGHMEM)
		#define GFP_HIGHUSER_MOVABLE (GFP_HIGHUSER \| __GFP_MOVABLE)
		#define GFP_IOFS (__GFP_IO \| __GFP_FS)
		#define GFP_TRANSHUGE (GFP_HIGHUSER_MOVABLE \| __GFP_COMP \| \
		__GFP_NOMEMALLOC \| __GFP_NORETRY \| __GFP_NOWARN \| \

Original line number	Diff line number	Diff line
		@@ -110,11 +110,8 @@ struct vm_area_struct;
		#define GFP_TEMPORARY (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| \
		__GFP_RECLAIMABLE)
		#define GFP_USER (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| __GFP_HARDWALL)
		#define GFP_HIGHUSER (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| __GFP_HARDWALL \| \
		__GFP_HIGHMEM)
		#define GFP_HIGHUSER_MOVABLE (__GFP_WAIT \| __GFP_IO \| __GFP_FS \| \
		__GFP_HARDWALL \| __GFP_HIGHMEM \| \
		__GFP_MOVABLE)
		#define GFP_HIGHUSER (GFP_USER \| __GFP_HIGHMEM)
		#define GFP_HIGHUSER_MOVABLE (GFP_HIGHUSER \| __GFP_MOVABLE)
		#define GFP_IOFS (__GFP_IO \| __GFP_FS)
		#define GFP_TRANSHUGE (GFP_HIGHUSER_MOVABLE \| __GFP_COMP \| \
		__GFP_NOMEMALLOC \| __GFP_NORETRY \| __GFP_NOWARN \| \

Admin message