commit 191c542442fdf53cc3c496c00be13367fd9cd42d
author Al Viro <viro@ftp.linux.org.uk> Mon Feb 13 03:58:52 2012 +0000
committer James Morris <jmorris@namei.org> Tue Feb 14 10:45:39 2012 +1100
tree 4aef9e33a1d99e6530b704243efbe373bb314d61
parent bbd36568594d091e682a1975ef4ee41d808de0bc

mm: collapse security_vm_enough_memory() variants into a single function

Collapse security_vm_enough_memory() variants into a single function.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: James Morris <jmorris@namei.org>

mm/shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 269d049..d9c2939 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -127,7 +127,7 @@
 static inline int shmem_acct_size(unsigned long flags, loff_t size)
 {
 	return (flags & VM_NORESERVE) ?
-		0 : security_vm_enough_memory_kern(VM_ACCT(size));
+		0 : security_vm_enough_memory_mm(current->mm, VM_ACCT(size));
 }
 
 static inline void shmem_unacct_size(unsigned long flags, loff_t size)
@@ -145,7 +145,7 @@
 static inline int shmem_acct_block(unsigned long flags)
 {
 	return (flags & VM_NORESERVE) ?
-		security_vm_enough_memory_kern(VM_ACCT(PAGE_CACHE_SIZE)) : 0;
+		security_vm_enough_memory_mm(current->mm, VM_ACCT(PAGE_CACHE_SIZE)) : 0;
 }
 
 static inline void shmem_unacct_blocks(unsigned long flags, long pages)