When building for Sun-3 (e.g. sun3_defconfig):
In file included from ./arch/m68k/include/asm/mmu_context.h:312,
from arch/m68k/sun3/mmu_emu.c:28:
./include/asm-generic/mmu_context.h:46:20: error: redefinition of ‘destroy_context’
46 | static inline void destroy_context(struct mm_struct *mm)
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/sun3/mmu_emu.c:28:
./arch/m68k/include/asm/mmu_context.h:192:20: note: previous definition of ‘destroy_context’ was here
192 | static inline void destroy_context(struct mm_struct *mm)
| ^~~~~~~~~~~~~~~
Fix this by marking destroy_context implemented by arch-specific code.
Reported-by: [email protected]
Fixes: cb41155766b05935 ("m68k: use asm-generic/mmu_context.h for no-op implementations")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/asm/mmu_context.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h
index d12d8a9032f67bdd..a5d358855878490f 100644
--- a/arch/m68k/include/asm/mmu_context.h
+++ b/arch/m68k/include/asm/mmu_context.h
@@ -189,6 +189,7 @@ static inline void get_mmu_context(struct mm_struct *mm)
}
/* flush context if allocated... */
+#define destroy_context destroy_context
static inline void destroy_context(struct mm_struct *mm)
{
if (mm->context != SUN3_INVALID_CONTEXT)
--
2.25.1
From: Arnd Bergmann <[email protected]>
On Tue, 27 Oct 2020 09:19:19 +0100, Geert Uytterhoeven wrote:
> When building for Sun-3 (e.g. sun3_defconfig):
>
> In file included from ./arch/m68k/include/asm/mmu_context.h:312,
> from arch/m68k/sun3/mmu_emu.c:28:
> ./include/asm-generic/mmu_context.h:46:20: error: redefinition of ‘destroy_context’
> 46 | static inline void destroy_context(struct mm_struct *mm)
> | ^~~~~~~~~~~~~~~
> In file included from arch/m68k/sun3/mmu_emu.c:28:
> ./arch/m68k/include/asm/mmu_context.h:192:20: note: previous definition of ‘destroy_context’ was here
> 192 | static inline void destroy_context(struct mm_struct *mm)
> | ^~~~~~~~~~~~~~~
>
> [...]
Applied to asm-generic, thanks!
[1/1] m68k: mmu_context: Fix Sun-3 build
commit: 2040a6bf90b530165cc86dfa879d5daa3b85f220
Arnd