From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Tue, 1 Dec 2009 17:26:25 +0000 (-0500)
Subject: s390: uatomic add missing inline and other { }
X-Git-Tag: v0.3.2~7
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f64acda4a01445e948110f45ecd0e3c48c651a6f;p=userspace-rcu.git

s390: uatomic add missing inline and other { }

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---

diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic_arch_s390.h
index b67259e..f8e8dff 100644
--- a/urcu/uatomic_arch_s390.h
+++ b/urcu/uatomic_arch_s390.h
@@ -48,6 +48,8 @@
 #define uatomic_read(addr)	LOAD_SHARED(*(addr))
 
 /* xchg */
+
+static inline __attribute__((always_inline))
 unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 {
 	switch (len) {
@@ -106,12 +108,14 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 	}
 #if (BITS_PER_LONG == 64)
 	case 8:
+	{
 		__asm__ __volatile__(
 			"	csg %0,%2,%1\n"
 			: "+r"(old), "+m"(*addr)
 			: "r"(new)
 			: "memory", "cc");
 		return old;
+	}
 #endif
 	default:
 		__asm__ __volatile__(".long	0xd00d00");