TAS code originally written for s390 (32-bit) does not work for s390x

(64-bit).  Fix it.  Per report from Permaine Cheung.

diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 830666d379537a6fbb0d9a13717146b7b24dbce4..734035a3de217c03035206f7bd13edc8d2c2ea77 100644 (file)
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -150,7 +150,8 @@ tas(volatile slock_t *lock)
 
 #endif  /* __arm__ */
 
-#if defined(__s390__) || defined(__s390x__)
+
+#if defined(__s390__) && !defined(__s390x__)
 /*
  * S/390 Linux
  */
@@ -176,6 +177,32 @@ tas(volatile slock_t *lock)
 
 #endif  /* __s390__ */
 
+#if defined(__s390x__)
+/*
+ * S/390x Linux (64-bit zSeries)
+ */
+#define TAS(lock)         tas(lock)
+
+static __inline__ int
+tas(volatile slock_t *lock)
+{
+       int                     _res;
+
+       __asm__ __volatile__(
+               "       la      1,1                     \n"
+               "       lg      2,%2            \n"
+               "       slr 0,0                 \n"
+               "       cs      0,1,0(2)        \n"
+               "       lr      %1,0            \n"
+:              "=m"(lock), "=d"(_res)
+:              "m"(lock)
+:              "0", "1", "2");
+
+       return (_res);
+}
+
+#endif  /* __s390x__ */
+
 
 #if defined(__sparc__)
 #define TAS(lock) tas(lock)