X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-s390.h;h=169282b9d4d308de3e3ca23aa6ba5be7c46613e1;hp=2c205de3a8455f04b1b9a5729b63dce70547aa61;hb=81795ce399bef3af497e5767546458e20ce81bbf;hpb=919e789d0999bf13ef1ae670c536d2aef3709894

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index 2c205de3..169282b9 100644
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -18,19 +18,23 @@
 #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")
 
-/*
- * 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;
 
+#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;
 }