Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8

[cascardo/linux.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index c8bd59a..c2e5888 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1682,7 +1682,7 @@ void exit_mmap(struct mm_struct *mm)
        }
 }
 
-unsigned long vm_brk(unsigned long addr, unsigned long len)
+int vm_brk(unsigned long addr, unsigned long len)
 {
        return -ENOMEM;
 }