diff --git a/[refs] b/[refs]
index 9ad9a9084415..c36caf5357fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afff7e2b3b13dbd26a2b9991d3d571df111d92e8
+refs/heads/master: 46ee058cdb3abab9313cc9cb9e9927d7672a718c
diff --git a/trunk/include/asm-s390/atomic.h b/trunk/include/asm-s390/atomic.h
index d5a05cf47168..9d86ba6f12d0 100644
--- a/trunk/include/asm-s390/atomic.h
+++ b/trunk/include/asm-s390/atomic.h
@@ -123,19 +123,19 @@ typedef struct {
 #define atomic64_read(v)          ((v)->counter)
 #define atomic64_set(v,i)         (((v)->counter) = (i))
 
-static __inline__ void atomic64_add(int i, atomic64_t * v)
+static __inline__ void atomic64_add(long long i, atomic64_t * v)
 {
 	       __CSG_LOOP(v, i, "agr");
 }
-static __inline__ long long atomic64_add_return(int i, atomic64_t * v)
+static __inline__ long long atomic64_add_return(long long i, atomic64_t * v)
 {
 	return __CSG_LOOP(v, i, "agr");
 }
-static __inline__ long long atomic64_add_negative(int i, atomic64_t * v)
+static __inline__ long long atomic64_add_negative(long long i, atomic64_t * v)
 {
 	return __CSG_LOOP(v, i, "agr") < 0;
 }
-static __inline__ void atomic64_sub(int i, atomic64_t * v)
+static __inline__ void atomic64_sub(long long i, atomic64_t * v)
 {
 	       __CSG_LOOP(v, i, "sgr");
 }