From 2040a6bf90b530165cc86dfa879d5daa3b85f220 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 27 Oct 2020 09:19:19 +0100 Subject: [PATCH] m68k: mmu_context: Fix Sun-3 build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. Fixes: cb41155766b05935 ("m68k: use asm-generic/mmu_context.h for no-op implementations") Reported-by: noreply@ellerman.id.au Signed-off-by: Geert Uytterhoeven Signed-off-by: Arnd Bergmann --- 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 d12d8a9..a5d3588 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.7.4