1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
index ae7c8f9f94a5..2a113d6a7dfd 100644
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
@@ -21,7 +21,7 @@
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
 #define __CS_LOOP(ptr, op_val, op_string) ({                            \
-        typeof(ptr->counter) old_val, new_val;                          \
+        int old_val, new_val;                                           \
        asm volatile(                                                   \
                "       l       %0,%2\n"                                \
                "0:     lr      %1,%0\n"                                \
@@ -38,7 +38,7 @@
 #else /* __GNUC__ */
 #define __CS_LOOP(ptr, op_val, op_string) ({                            \
-        typeof(ptr->counter) old_val, new_val;                          \
+        int old_val, new_val;                                           \
        asm volatile(                                                   \
                "       l       %0,0(%3)\n"                             \
                "0:     lr      %1,%0\n"                                \
@@ -143,7 +143,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
 #define __CSG_LOOP(ptr, op_val, op_string) ({                           \
-        typeof(ptr->counter) old_val, new_val;                          \
+        long long old_val, new_val;                                     \
        asm volatile(                                                   \
                "       lg      %0,%2\n"                                \
                "0:     lgr     %1,%0\n"                                \
@@ -160,7 +160,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #else /* __GNUC__ */
 #define __CSG_LOOP(ptr, op_val, op_string) ({                           \
-        typeof(ptr->counter) old_val, new_val;                          \
+        long long old_val, new_val;                                     \
        asm volatile(                                                   \
                "       lg      %0,0(%3)\n"                             \
                "0:     lgr     %1,%0\n"                                \

diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h index ae7c8f9f94a5..2a113d6a7dfd 100644 --- a/arch/s390/include/asm/atomic.h +++ b/arch/s390/include/asm/atomic.h
@@ -21,7 +21,7 @@
21	#if __GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR__ > 2)	21	#if __GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
22		22
23	#define __CS_LOOP(ptr, op_val, op_string) ({ \	23	#define __CS_LOOP(ptr, op_val, op_string) ({ \
24	typeof(ptr->counter) old_val, new_val; \	24	int old_val, new_val; \
25	asm volatile( \	25	asm volatile( \
26	" l %0,%2\n" \	26	" l %0,%2\n" \
27	"0: lr %1,%0\n" \	27	"0: lr %1,%0\n" \
@@ -38,7 +38,7 @@
38	#else /* __GNUC__ */	38	#else /* __GNUC__ */
39		39
40	#define __CS_LOOP(ptr, op_val, op_string) ({ \	40	#define __CS_LOOP(ptr, op_val, op_string) ({ \
41	typeof(ptr->counter) old_val, new_val; \	41	int old_val, new_val; \
42	asm volatile( \	42	asm volatile( \
43	" l %0,0(%3)\n" \	43	" l %0,0(%3)\n" \
44	"0: lr %1,%0\n" \	44	"0: lr %1,%0\n" \
@@ -143,7 +143,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
143	#if __GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR__ > 2)	143	#if __GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
144		144
145	#define __CSG_LOOP(ptr, op_val, op_string) ({ \	145	#define __CSG_LOOP(ptr, op_val, op_string) ({ \
146	typeof(ptr->counter) old_val, new_val; \	146	long long old_val, new_val; \
147	asm volatile( \	147	asm volatile( \
148	" lg %0,%2\n" \	148	" lg %0,%2\n" \
149	"0: lgr %1,%0\n" \	149	"0: lgr %1,%0\n" \
@@ -160,7 +160,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
160	#else /* __GNUC__ */	160	#else /* __GNUC__ */
161		161
162	#define __CSG_LOOP(ptr, op_val, op_string) ({ \	162	#define __CSG_LOOP(ptr, op_val, op_string) ({ \
163	typeof(ptr->counter) old_val, new_val; \	163	long long old_val, new_val; \
164	asm volatile( \	164	asm volatile( \
165	" lg %0,0(%3)\n" \	165	" lg %0,0(%3)\n" \
166	"0: lgr %1,%0\n" \	166	"0: lgr %1,%0\n" \