summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2012-10-08 16:33:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 16:23:01 +0900
commit3e648ebe076390018c317881d7d926f24d7bac6b (patch)
treea1ce3f4b196756ac2850b47714f5a1dac6ce52ea
parentbeb51eaa88238daba698ad837222ad277d440b6d (diff)
downloadop-kernel-dev-3e648ebe076390018c317881d7d926f24d7bac6b.zip
op-kernel-dev-3e648ebe076390018c317881d7d926f24d7bac6b.tar.gz
make GFP_NOTRACK definition unconditional
There was a general sentiment in a recent discussion (See https://lkml.org/lkml/2012/9/18/258) that the __GFP flags should be defined unconditionally. Currently, the only offender is GFP_NOTRACK, which is conditional to KMEMCHECK. Signed-off-by: Glauber Costa <glommer@parallels.com> Acked-by: Christoph Lameter <cl@linux.com> Cc: Mel Gorman <mgorman@suse.de> 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>
-rw-r--r--include/linux/gfp.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index f9bc873..02c1c97 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -30,11 +30,7 @@ struct vm_area_struct;
#define ___GFP_HARDWALL 0x20000u
#define ___GFP_THISNODE 0x40000u
#define ___GFP_RECLAIMABLE 0x80000u
-#ifdef CONFIG_KMEMCHECK
#define ___GFP_NOTRACK 0x200000u
-#else
-#define ___GFP_NOTRACK 0
-#endif
#define ___GFP_OTHER_NODE 0x800000u
#define ___GFP_WRITE 0x1000000u
OpenPOWER on IntegriCloud