X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-s390.h;h=169282b9d4d308de3e3ca23aa6ba5be7c46613e1;hb=f0cc675fd0a5902f3637a91024082d2d24a665a7;hp=fe5179134891d66d944797ee8132f2a306e4513c;hpb=cca84643cc10cd72b0b453ff92ccb8643ba51493;p=fio.git

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index fe517913..169282b9 100644
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -18,8 +18,35 @@
 #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")
 
+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");
+#endif
+	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[])
+{
+	tsc_reliable = 1;
+	return 0;
+}
+
 #endif