This reverts commit b635e5ee4f93554e2af7feb08866e67df10f3940. We are going to switch to the whitelist kmem accounting policy, so zap every usage of __GFP_NOACCOUNT.
Signed-off-by: Vladimir Davydov <[email protected]> --- lib/radix-tree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 4b362cbab819..dd3347fc6d5b 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -228,8 +228,7 @@ radix_tree_node_alloc(struct radix_tree_root *root) } } if (ret == NULL) - ret = kmem_cache_alloc(radix_tree_node_cachep, - gfp_mask | __GFP_NOACCOUNT); + ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); BUG_ON(radix_tree_is_indirect_ptr(ret)); return ret; @@ -280,8 +279,7 @@ static int __radix_tree_preload(gfp_t gfp_mask) rtp = &__get_cpu_var(radix_tree_preloads); while (rtp->nr < ARRAY_SIZE(rtp->nodes)) { preempt_enable(); - node = kmem_cache_alloc(radix_tree_node_cachep, - gfp_mask | __GFP_NOACCOUNT); + node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); if (node == NULL) goto out; preempt_disable(); -- 2.1.4 _______________________________________________ Devel mailing list [email protected] https://lists.openvz.org/mailman/listinfo/devel
