Skip to content

Commit

Permalink
m68k: mmu_context: Fix Sun-3 build
Browse files Browse the repository at this point in the history
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 <geert+renesas@glider.be>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Geert Uytterhoeven authored and Arnd Bergmann committed Oct 27, 2020
1 parent 0a1c8e5 commit 2040a6b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/m68k/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2040a6b

Please sign in to comment.