[-next] mm/nommu: Fix return type of filemap_map_pages()
diff mbox series

Message ID 20210128100626.2257638-1-geert@linux-m68k.org
State Accepted
Commit 3f98a28cc37253269b4104cf95a51f7716a2eb97
Headers show
Series
  • [-next] mm/nommu: Fix return type of filemap_map_pages()
Related show

Commit Message

Geert Uytterhoeven Jan. 28, 2021, 10:06 a.m. UTC
If CONFIG_MMU is not set (e.g. m68k/m5272c3_defconfig):

    mm/nommu.c:1671:6: error: conflicting types for ‘filemap_map_pages’
     1671 | void filemap_map_pages(struct vm_fault *vmf,
	  |      ^~~~~~~~~~~~~~~~~
    In file included from mm/nommu.c:20:
    ./include/linux/mm.h:2578:19: note: previous declaration of ‘filemap_map_pages’ was here
     2578 | extern vm_fault_t filemap_map_pages(struct vm_fault *vmf,
	  |                   ^~~~~~~~~~~~~~~~~

The signature of filemap_map_pages() was changed, but the nommu
implementation wasn't updated.

Reported-by: noreply@ellerman.id.au
Fixes: f9ce0be71d1fbb03 ("mm: Cleanup faultaround and finish_fault() codepaths")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Compile-tested only.
Feel free to fold into the commit introducing the issue.
---
 mm/nommu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Will Deacon Jan. 28, 2021, 6:29 p.m. UTC | #1
On Thu, 28 Jan 2021 11:06:26 +0100, Geert Uytterhoeven wrote:
> If CONFIG_MMU is not set (e.g. m68k/m5272c3_defconfig):
> 
>     mm/nommu.c:1671:6: error: conflicting types for ‘filemap_map_pages’
>      1671 | void filemap_map_pages(struct vm_fault *vmf,
> 	  |      ^~~~~~~~~~~~~~~~~
>     In file included from mm/nommu.c:20:
>     ./include/linux/mm.h:2578:19: note: previous declaration of ‘filemap_map_pages’ was here
>      2578 | extern vm_fault_t filemap_map_pages(struct vm_fault *vmf,
> 	  |                   ^~~~~~~~~~~~~~~~~
> 
> [...]

Applied to arm64 (for-next/faultaround), thanks!

[1/1] mm/nommu: Fix return type of filemap_map_pages()
      https://git.kernel.org/arm64/c/3f98a28cc372

Cheers,

Patch
diff mbox series

diff --git a/mm/nommu.c b/mm/nommu.c
index 870fea12823e633d..5c9ab799c0e63958 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1668,10 +1668,11 @@  vm_fault_t filemap_fault(struct vm_fault *vmf)
 }
 EXPORT_SYMBOL(filemap_fault);
 
-void filemap_map_pages(struct vm_fault *vmf,
+vm_fault_t filemap_map_pages(struct vm_fault *vmf,
 		pgoff_t start_pgoff, pgoff_t end_pgoff)
 {
 	BUG();
+	return 0;
 }
 EXPORT_SYMBOL(filemap_map_pages);