[Devel] [PATCH RHEL COMMIT] vmalloc: drop __vmalloc_node_flags calls from v[mz]alloc_account

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit 33326b2398ea922a69dd9fc564d4361cf3520aa8
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Tue Sep 28 15:50:28 2021 +0300

    vmalloc: drop __vmalloc_node_flags calls from v[mz]alloc_account
    
    __vmalloc_node_flags() was dropped in upstream
    
    Fixes: 6253bfcdca02 ("mm/vmalloc: add v[mz]alloc_account helpers")
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 mm/vmalloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index fe575cdba254..e06162043885 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -3089,15 +3089,15 @@ EXPORT_SYMBOL(vzalloc);
 
 void *vmalloc_account(unsigned long size)
 {
-	return __vmalloc_node_flags(size, NUMA_NO_NODE,
-			GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM);
+	return __vmalloc_node(size, 1, GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM,
+			      NUMA_NO_NODE, __builtin_return_address(0));
 }
 EXPORT_SYMBOL(vmalloc_account);
 
 void *vzalloc_account(unsigned long size)
 {
-	return __vmalloc_node_flags(size, NUMA_NO_NODE,
-			GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM | __GFP_ZERO);
+	return __vmalloc_node(size, 1, GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM | __GFP_ZERO,
+			      NUMA_NO_NODE, __builtin_return_address(0));
 }
 EXPORT_SYMBOL(vzalloc_account);