[Devel] [PATCH RHEL7 COMMIT] Revert "mm/vmalloc: do not account vmap_area to memcg"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.10.1.vz7.12.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.10.1.vz7.12.16
------>
commit efa8c7fda4fac398a6b7c04c806e1613343e5bf1
Author: Vladimir Davydov <vdavydov at virtuozzo.com>
Date:   Mon May 2 18:05:58 2016 +0400

    Revert "mm/vmalloc: do not account vmap_area to memcg"
    
    This reverts commit aeac47f55e9e0e40a655d02a7846d8c09f4704f8.
    
    We are going to switch to the whitelist kmem accounting policy, so zap
    every usage of __GFP_NOACCOUNT.
    
    Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 mm/vmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index e29fe5e..32d3744 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -355,7 +355,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size,
 	BUG_ON(!is_power_of_2(align));
 
 	va = kmalloc_node(sizeof(struct vmap_area),
-			(gfp_mask & GFP_RECLAIM_MASK) | __GFP_NOACCOUNT, node);
+			gfp_mask & GFP_RECLAIM_MASK, node);
 	if (unlikely(!va))
 		return ERR_PTR(-ENOMEM);