Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-block.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 13723736d38f95a5be12b14ab3699d8a148a7d53..4452d8bd9ae4b84851f433885eac18e050d72dad 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1763,7 +1763,7 @@ unsigned long arch_get_unmapped_area(struct file *file, unsigned long addr,
        return -ENOMEM;
 }
 
-int filemap_fault(struct vm_fault *vmf)
+vm_fault_t filemap_fault(struct vm_fault *vmf)
 {
        BUG();
        return 0;