X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-s390.h;h=6bf033b00a84d4208ec5f83a0b084d5cf961ed07;hb=be26a9823261c15c6e737e2e6c8762423cf325b8;hp=bcd91636d04d8e6e3bd2137672377f84813cd57e;hpb=92a0daf8163eaa8d117d1e6e4fdc11a8dddac2d2;p=fio.git

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index bcd91636..6bf033b0 100644
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -3,22 +3,7 @@
 
 #define FIO_ARCH	(arch_s390)
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set		282
-#define __NR_ioprio_get		283
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64		253
-#endif
-
-#ifndef __NR_sys_splice
-#define __NR_sys_splice		306
-#define __NR_sys_tee		308
-#define __NR_sys_vmsplice	309
-#endif
-
-#define nop		asm volatile ("diag 0,0,68" : : : "memory")
+#define nop		asm volatile("nop" : : : "memory")
 #define read_barrier()	asm volatile("bcr 15,0" : : : "memory")
 #define write_barrier()	asm volatile("bcr 15,0" : : : "memory")
 
@@ -26,18 +11,28 @@ static inline unsigned long long get_cpu_clock(void)
 {
 	unsigned long long clk;
 
+#ifdef CONFIG_S390_Z196_FACILITIES
+	/*
+	 * Fio needs monotonic (never lower), but not strict monotonic (never
+	 * the same) so store clock fast is enough.
+	 */
+	__asm__ __volatile__("stckf %0" : "=Q" (clk) : : "cc");
+#else
 	__asm__ __volatile__("stck %0" : "=Q" (clk) : : "cc");
-	return clk;
+#endif
+	return clk>>12;
 }
 
+#define ARCH_CPU_CLOCK_CYCLES_PER_USEC 1
+#define ARCH_HAVE_CPU_CLOCK
+#undef ARCH_CPU_CLOCK_WRAPS
+
 #define ARCH_HAVE_INIT
-extern int tsc_reliable;
+extern bool tsc_reliable;
 static inline int arch_init(char *envp[])
 {
-	tsc_reliable = 1;
+	tsc_reliable = true;
 	return 0;
 }
 
-#define ARCH_HAVE_CPU_CLOCK
-
 #endif