From: Julien Grall Date: Thu, 3 Apr 2014 17:09:10 +0000 (+0100) Subject: xen/arm32: __cmpxchg_mb should be marked always_inline X-Git-Tag: 4.5.0-rc1~1091 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d2b4c27c0718f27deba00a16317a8ba04c1a2cb7;p=xen.git xen/arm32: __cmpxchg_mb should be marked always_inline Currently __cmpxchg_mb is only marked inline. The compiler can decide to not inline this function. In this case, the call to __cmpxchg will be inlined but not optimised. This will result linking failure because of __bad_cmpxchg. Caught by clang 3.5. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- diff --git a/xen/include/asm-arm/arm32/cmpxchg.h b/xen/include/asm-arm/arm32/cmpxchg.h index 70c6090cc1..3f4e7a15ee 100644 --- a/xen/include/asm-arm/arm32/cmpxchg.h +++ b/xen/include/asm-arm/arm32/cmpxchg.h @@ -112,8 +112,9 @@ static always_inline unsigned long __cmpxchg( return oldval; } -static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, - unsigned long new, int size) +static always_inline unsigned long __cmpxchg_mb(volatile void *ptr, + unsigned long old, + unsigned long new, int size) { unsigned long ret;