Merge branch 'linus' into perfcounters/core

[~andy/linux] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 1df63f614f97fc08d57abca4e9172e517c5b5661..8a49df4c73637e54d546a161f1d458cfada9725f 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1579,7 +1579,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
         * Overcommit..  This must be the final test, as it will
         * update security statistics.
         */
-       if (security_vm_enough_memory(grow))
+       if (security_vm_enough_memory_mm(mm, grow))
                return -ENOMEM;
 
        /* Ok, everything looks good - let it rip */