Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b4e1ded3cf6e13c122f019532cb60347d6c88c8c

Authored by Al Viro
Committed by Linus Torvalds
1 parent 8eafafb54b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

m32r: __xchg() should be always_inline 

it depends on elimination of unreachable branches in switch (by object
size), so we must declare it always_inline

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/asm-m32r/system.h
Diff comments   View file @ b4e1ded
... ... @@ -10,6 +10,7 @@
10 10 * Copyright (C) 2004, 2006 Hirokazu Takata <takata at linux-m32r.org>
11 11 */
12 12  
  13 +#include <linux/compiler.h>
13 14 #include <asm/assembler.h>
14 15  
15 16 #ifdef __KERNEL__
... ... @@ -154,7 +155,7 @@
154 155 #define DCACHE_CLEAR(reg0, reg1, addr)
155 156 #endif /* CONFIG_CHIP_M32700_TS1 */
156 157  
157   -static inline unsigned long
  158 +static __always_inline unsigned long
158 159 __xchg(unsigned long x, volatile void * ptr, int size)
159 160 {
160 161 unsigned long flags;