diff options
author | Glauber Costa <glommer@parallels.com> | 2012-10-08 19:33:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:23:01 -0400 |
commit | 3e648ebe076390018c317881d7d926f24d7bac6b (patch) | |
tree | a1ce3f4b196756ac2850b47714f5a1dac6ce52ea | |
parent | beb51eaa88238daba698ad837222ad277d440b6d (diff) |
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.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index f9bc873ce7d6..02c1c9710be0 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
@@ -30,11 +30,7 @@ struct vm_area_struct; | |||
30 | #define ___GFP_HARDWALL 0x20000u | 30 | #define ___GFP_HARDWALL 0x20000u |
31 | #define ___GFP_THISNODE 0x40000u | 31 | #define ___GFP_THISNODE 0x40000u |
32 | #define ___GFP_RECLAIMABLE 0x80000u | 32 | #define ___GFP_RECLAIMABLE 0x80000u |
33 | #ifdef CONFIG_KMEMCHECK | ||
34 | #define ___GFP_NOTRACK 0x200000u | 33 | #define ___GFP_NOTRACK 0x200000u |
35 | #else | ||
36 | #define ___GFP_NOTRACK 0 | ||
37 | #endif | ||
38 | #define ___GFP_OTHER_NODE 0x800000u | 34 | #define ___GFP_OTHER_NODE 0x800000u |
39 | #define ___GFP_WRITE 0x1000000u | 35 | #define ___GFP_WRITE 0x1000000u |
40 | 36 | ||