1 files changed, 4 insertions, 3 deletions

diff --git a/fs/file.c b/fs/file.c
index 1aed0add16a2..1fbc5c0555a9 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -37,11 +37,12 @@ static void *alloc_fdmem(size_t size)
          * vmalloc() if the allocation size will be considered "large" by the VM.
          */
         if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) {
-                void *data = kmalloc(size, GFP_KERNEL|__GFP_NOWARN|__GFP_NORETRY);
+                void *data = kmalloc(size, GFP_KERNEL_ACCOUNT |
+                                     __GFP_NOWARN | __GFP_NORETRY);
                 if (data != NULL)
                         return data;
         }
-        return vmalloc(size);
+        return __vmalloc(size, GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM, PAGE_KERNEL);
 }
 
 static void __free_fdtable(struct fdtable *fdt)
@@ -126,7 +127,7 @@ static struct fdtable * alloc_fdtable(unsigned int nr)
         if (unlikely(nr > sysctl_nr_open))
                 nr = ((sysctl_nr_open - 1) | (BITS_PER_LONG - 1)) + 1;
 
-        fdt = kmalloc(sizeof(struct fdtable), GFP_KERNEL);
+        fdt = kmalloc(sizeof(struct fdtable), GFP_KERNEL_ACCOUNT);
         if (!fdt)
                 goto out;
         fdt->max_fds = nr;