diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
tree | 89b840115ccd753216ba0b26e587e52699b99310 /include/linux/gfp.h | |
parent | intel powerclamp: support Knights Landing (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff) | |
download | linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip |
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'include/linux/gfp.h')
-rw-r--r-- | include/linux/gfp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 97a9373e61e8..15928f0647e4 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -30,6 +30,7 @@ struct vm_area_struct; #define ___GFP_HARDWALL 0x20000u #define ___GFP_THISNODE 0x40000u #define ___GFP_RECLAIMABLE 0x80000u +#define ___GFP_NOACCOUNT 0x100000u #define ___GFP_NOTRACK 0x200000u #define ___GFP_NO_KSWAPD 0x400000u #define ___GFP_OTHER_NODE 0x800000u @@ -87,6 +88,7 @@ struct vm_area_struct; #define __GFP_HARDWALL ((__force gfp_t)___GFP_HARDWALL) /* Enforce hardwall cpuset memory allocs */ #define __GFP_THISNODE ((__force gfp_t)___GFP_THISNODE)/* No fallback, no policies */ #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */ +#define __GFP_NOACCOUNT ((__force gfp_t)___GFP_NOACCOUNT) /* Don't account to kmemcg */ #define __GFP_NOTRACK ((__force gfp_t)___GFP_NOTRACK) /* Don't track with kmemcheck */ #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD) |