Merge branch 'master' of git://github.com/cvubrugier/fio

[fio.git] / arch / arch-s390.h

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index 56cb23024bf70f8954cc7bfe29e5b439345f54d7..169282b9d4d308de3e3ca23aa6ba5be7c46613e1 100644 (file)
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -22,15 +22,19 @@
 #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;
 }