X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-s390.h;h=6bf033b00a84d4208ec5f83a0b084d5cf961ed07;hp=5e13155951111876c6878b8a707c037970ece2ea;hb=58828d0759642a8d438c94ee96a3e9848f89102a;hpb=db6defc77508f5bf217f0a6768d13426eee21119

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index 5e131559..6bf033b0 100644
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -1,19 +1,38 @@
 #ifndef ARCH_S390_H
 #define ARCH_S390_H
 
-#define ARCH	(arch_s390)
+#define FIO_ARCH	(arch_s390)
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set		282
-#define __NR_ioprio_get		283
-#endif
+#define nop		asm volatile("nop" : : : "memory")
+#define read_barrier()	asm volatile("bcr 15,0" : : : "memory")
+#define write_barrier()	asm volatile("bcr 15,0" : : : "memory")
+
+static inline unsigned long long get_cpu_clock(void)
+{
+	unsigned long long clk;
 
-#ifndef __NR_fadvise64
-#define __NR_fadvise64		253
+#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");
 #endif
+	return clk>>12;
+}
 
-#define nop		asm volatile ("diag 0,0,68" : : : "memory")
-#define fio_ffz(v)	generic_ffz((v))
-#define read_barrier()	asm volatile("bcr 15,0" : : : "memory")
+#define ARCH_CPU_CLOCK_CYCLES_PER_USEC 1
+#define ARCH_HAVE_CPU_CLOCK
+#undef ARCH_CPU_CLOCK_WRAPS
+
+#define ARCH_HAVE_INIT
+extern bool tsc_reliable;
+static inline int arch_init(char *envp[])
+{
+	tsc_reliable = true;
+	return 0;
+}
 
 #endif