queue-5.1/mips-mark-ginvt-as-__always_inline.patch

   1 From b7f4e51ead0e10ca69d6a900574c987ed26f9456 Mon Sep 17 00:00:00 2001
   2 From: Masahiro Yamada <yamada.masahiro@socionext.com>
   3 Date: Tue, 21 May 2019 15:20:39 +0900
   4 Subject: MIPS: mark ginvt() as __always_inline
   5
   6 [ Upstream commit 6074c33c6b2eabc70867ef76d57ca256e9ea9da7 ]
   7
   8 To meet the 'i' (immediate) constraint for the asm operands,
   9 this function must be always inlined.
  10
  11 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
  12 Signed-off-by: Paul Burton <paul.burton@mips.com>
  13 Cc: linux-mips@vger.kernel.org
  14 Cc: Ralf Baechle <ralf@linux-mips.org>
  15 Cc: James Hogan <jhogan@kernel.org>
  16 Cc: linux-kernel@vger.kernel.org
  17 Signed-off-by: Sasha Levin <sashal@kernel.org>
  18 ---
  19  arch/mips/include/asm/ginvt.h | 2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 diff --git a/arch/mips/include/asm/ginvt.h b/arch/mips/include/asm/ginvt.h
  23 index 49c6dbe37338..6eb7c2b94dc7 100644
  24 --- a/arch/mips/include/asm/ginvt.h
  25 +++ b/arch/mips/include/asm/ginvt.h
  26 @@ -19,7 +19,7 @@ _ASM_MACRO_1R1I(ginvt, rs, type,
  27  # define _ASM_SET_GINV
  28  #endif
  29
  30 -static inline void ginvt(unsigned long addr, enum ginvt_type type)
  31 +static __always_inline void ginvt(unsigned long addr, enum ginvt_type type)
  32  {
  33         asm volatile(
  34                 ".set   push\n"
  35 --
  36 2.20.1
  37