arm64: Provide "model name" in /proc/cpuinfo for PER_LINUX32 tasks

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

diff --git a/mm/nommu.c b/mm/nommu.c
index b74512746aae82588421eef1f87588a3536709a5..c2e58880207faa268e32541cdb68f7d0e7f6f9b2 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1446,7 +1446,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
 
        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-       retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff, true);
+       retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
 
        if (file)
                fput(file);
@@ -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;
 }