SLUB: add some more inlines and #ifdef CONFIG_SLUB_DEBUG

[karo-tx-linux.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 2b16b00a5b115be2c13897aab5763562312ecb84..8bbbf147a79421fd59d5c616266a74b5142232e6 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -367,6 +367,11 @@ struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
        return find_vma(mm, addr);
 }
 
+int expand_stack(struct vm_area_struct *vma, unsigned long address)
+{
+       return -ENOMEM;
+}
+
 /*
  * look up the first VMA exactly that exactly matches addr
  * - should be called with mm->mmap_sem at least held readlocked
@@ -639,7 +644,7 @@ static int validate_mmap_request(struct file *file,
        }
 
        /* allow the security API to have its say */
-       ret = security_file_mmap(file, reqprot, prot, flags);
+       ret = security_file_mmap(file, reqprot, prot, flags, addr, 0);
        if (ret < 0)
                return ret;