Use `static inline' rather than `static __maybe_unused' for `mipsr2_decoder' in the empty case, making inlining explicit where it will happen anyway. Cc: Leonid Yegoshin <Leonid.Yegoshin@xxxxxxxxxx> Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx> --- linux-mips-r2-decoder-inline.patch Index: linux/arch/mips/include/asm/mips-r2-to-r6-emul.h =================================================================== --- linux.orig/arch/mips/include/asm/mips-r2-to-r6-emul.h 2015-04-02 20:18:51.667537000 +0100 +++ linux/arch/mips/include/asm/mips-r2-to-r6-emul.h 2015-04-02 20:27:53.724187000 +0100 @@ -84,7 +84,7 @@ extern void do_trap_or_bp(struct pt_regs #ifndef CONFIG_MIPSR2_TO_R6_EMULATOR static int mipsr2_emulation; -static __maybe_unused int mipsr2_decoder(struct pt_regs *regs, u32 inst) { return 0; }; +static inline int mipsr2_decoder(struct pt_regs *regs, u32 inst) { return 0; }; #else /* MIPS R2 Emulator ON/OFF */ extern int mipsr2_emulation;