fio: fix s390 time accounting

[fio.git] / arch / arch-s390.h

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index bcd91636d04d8e6e3bd2137672377f84813cd57e..2c205de3a8455f04b1b9a5729b63dce70547aa61 100644 (file)
--- 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")
 
 #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;
 
 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[])
 #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;
 }
 
        return 0;
 }
 

-#define ARCH_HAVE_CPU_CLOCK
-

 #endif
 #endif