X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-s390.h;h=2e84bf8ad45744ec6d74c7ed09918d83565f9c32;hb=0cf59b52d81ec0c70c60b9516b2e740f408b9d1c;hp=ed5d462d1d969b7e2db4cb994a88115813b24b44;hpb=b12ebc65e82de1cc6174b65c79266dd0f0a4fbf3;p=fio.git

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index ed5d462d..2e84bf8a 100644
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -1,18 +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 ARCH_CPU_CLOCK_CYCLES_PER_USEC 1
+#define ARCH_HAVE_CPU_CLOCK
+#undef ARCH_CPU_CLOCK_WRAPS
 
-#define nop		asm volatile ("diag 0,0,68" : : : "memory")
-#define fio_ffz(v)	generic_ffz((v))
+#define ARCH_HAVE_INIT
+extern int tsc_reliable;
+static inline int arch_init(char *envp[])
+{
+	tsc_reliable = 1;
+	return 0;
+}
 
 #endif