| From cdfba07b47301536fa62014d74e3b7f08f8b06e1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 9 Oct 2019 12:06:00 +0200 |
| Subject: MIPS: include: Mark __xchg as __always_inline |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Thomas Bogendoerfer <tbogendoerfer@suse.de> |
| |
| [ Upstream commit 46f1619500d022501a4f0389f9f4c349ab46bb86 ] |
| |
| Commit ac7c3e4ff401 ("compiler: enable CONFIG_OPTIMIZE_INLINING |
| forcibly") allows compiler to uninline functions marked as 'inline'. |
| In cace of __xchg this would cause to reference function |
| __xchg_called_with_bad_pointer, which is an error case |
| for catching bugs and will not happen for correct code, if |
| __xchg is inlined. |
| |
| Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> |
| Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> |
| Signed-off-by: Paul Burton <paul.burton@mips.com> |
| Cc: Ralf Baechle <ralf@linux-mips.org> |
| Cc: James Hogan <jhogan@kernel.org> |
| Cc: linux-mips@vger.kernel.org |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/mips/include/asm/cmpxchg.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h |
| index 895f91b9e89c3..520ca166cbed5 100644 |
| --- a/arch/mips/include/asm/cmpxchg.h |
| +++ b/arch/mips/include/asm/cmpxchg.h |
| @@ -73,8 +73,8 @@ extern unsigned long __xchg_called_with_bad_pointer(void) |
| extern unsigned long __xchg_small(volatile void *ptr, unsigned long val, |
| unsigned int size); |
| |
| -static inline unsigned long __xchg(volatile void *ptr, unsigned long x, |
| - int size) |
| +static __always_inline |
| +unsigned long __xchg(volatile void *ptr, unsigned long x, int size) |
| { |
| switch (size) { |
| case 1: |
| -- |
| 2.20.1 |
| |
