* [PATCH -next] mm/nommu: Fix return type of filemap_map_pages()
@ 2021-01-28 10:06 Geert Uytterhoeven
2021-01-28 18:29 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2021-01-28 10:06 UTC (permalink / raw)
To: Kirill A . Shutemov, Will Deacon, Andrew Morton; +Cc: linux-mm, linux-kernel
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(-)
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);
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -next] mm/nommu: Fix return type of filemap_map_pages()
2021-01-28 10:06 [PATCH -next] mm/nommu: Fix return type of filemap_map_pages() Geert Uytterhoeven
@ 2021-01-28 18:29 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2021-01-28 18:29 UTC (permalink / raw)
To: Geert Uytterhoeven, Kirill A . Shutemov, Andrew Morton
Cc: catalin.marinas, kernel-team, Will Deacon, linux-mm, linux-kernel
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,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-28 18:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-28 10:06 [PATCH -next] mm/nommu: Fix return type of filemap_map_pages() Geert Uytterhoeven
2021-01-28 18:29 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox