X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-s390.h;h=2c205de3a8455f04b1b9a5729b63dce70547aa61;hp=bcd91636d04d8e6e3bd2137672377f84813cd57e;hb=919e789d0999bf13ef1ae670c536d2aef3709894;hpb=15cf40b2844caad4cf8da0cdaeddd132cd6adefc

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index bcd91636..2c205de3 100644
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -22,14 +22,21 @@
 #define read_barrier()	asm volatile("bcr 15,0" : : : "memory")
 #define write_barrier()	asm volatile("bcr 15,0" : : : "memory")
 
+/*
+ * Fio needs monotonic (never lower), but not strict monotonic (never the same)
+ * so store clock fast is enough
+ */
 static inline unsigned long long get_cpu_clock(void)
 {
 	unsigned long long clk;
 
-	__asm__ __volatile__("stck %0" : "=Q" (clk) : : "cc");
-	return clk;
+	__asm__ __volatile__("stckf %0" : "=Q" (clk) : : "cc");
+	return clk>>12;
 }
 
+#define ARCH_CPU_CLOCK_CYCLES_PER_USEC 1
+#define ARCH_HAVE_CPU_CLOCK
+
 #define ARCH_HAVE_INIT
 extern int tsc_reliable;
 static inline int arch_init(char *envp[])
@@ -38,6 +45,4 @@ static inline int arch_init(char *envp[])
 	return 0;
 }
 
-#define ARCH_HAVE_CPU_CLOCK
-
 #endif