1 files changed, 6 insertions, 16 deletions

diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
index 68d9fea34b4b..f174bdaa6b59 100644
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@ -20,10 +20,10 @@ static inline int set_clock(__u64 time)
         int cc;
 
         asm volatile(
-                "   sck   0(%2)\n"
+                "   sck   %1\n"
                 "   ipm   %0\n"
                 "   srl   %0,28\n"
-                : "=d" (cc) : "m" (time), "a" (&time) : "cc");
+                : "=d" (cc) : "Q" (time) : "cc");
         return cc;
 }
 
@@ -32,21 +32,21 @@ static inline int store_clock(__u64 *time)
         int cc;
 
         asm volatile(
-                "   stck  0(%2)\n"
+                "   stck  %1\n"
                 "   ipm   %0\n"
                 "   srl   %0,28\n"
-                : "=d" (cc), "=m" (*time) : "a" (time) : "cc");
+                : "=d" (cc), "=Q" (*time) : : "cc");
         return cc;
 }
 
 static inline void set_clock_comparator(__u64 time)
 {
-        asm volatile("sckc 0(%1)" : : "m" (time), "a" (&time));
+        asm volatile("sckc %0" : : "Q" (time));
 }
 
 static inline void store_clock_comparator(__u64 *time)
 {
-        asm volatile("stckc 0(%1)" : "=m" (*time) : "a" (time));
+        asm volatile("stckc %0" : "=Q" (*time));
 }
 
 #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
@@ -57,11 +57,7 @@ static inline unsigned long long get_clock (void)
 {
         unsigned long long clk;
 
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
         asm volatile("stck %0" : "=Q" (clk) : : "cc");
-#else /* __GNUC__ */
-        asm volatile("stck 0(%1)" : "=m" (clk) : "a" (&clk) : "cc");
-#endif /* __GNUC__ */
         return clk;
 }
 
@@ -69,13 +65,7 @@ static inline unsigned long long get_clock_xt(void)
 {
         unsigned char clk[16];
 
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
         asm volatile("stcke %0" : "=Q" (clk) : : "cc");
-#else /* __GNUC__ */
-        asm volatile("stcke 0(%1)" : "=m" (clk)
-                                   : "a" (clk) : "cc");
-#endif /* __GNUC__ */
-
         return *((unsigned long long *)&clk[1]);
 }