Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 9eef6a3..8ed0cb4 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1270,7 +1270,7 @@ EXPORT_SYMBOL(get_unmapped_area);
  * Note this is a helper function intended to be used by LSMs which
  * wish to use this logic.
  */
-int __vm_enough_memory(long pages, int cap_sys_admin)
+int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
 {
        unsigned long free, allowed;