Merge branch 'armv6' of https://github.com/sitsofe/fio

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

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index 169282b9d4d308de3e3ca23aa6ba5be7c46613e1..6bf033b00a84d4208ec5f83a0b084d5cf961ed07 100644 (file)
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -3,21 +3,6 @@
 
 #define FIO_ARCH       (arch_s390)
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set                282
-#define __NR_ioprio_get                283
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64         253
-#endif
-
-#ifndef __NR_sys_splice
-#define __NR_sys_splice                306
-#define __NR_sys_tee           308
-#define __NR_sys_vmsplice      309
-#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")
@@ -40,12 +25,13 @@ static inline unsigned long long get_cpu_clock(void)
 
 #define ARCH_CPU_CLOCK_CYCLES_PER_USEC 1
 #define ARCH_HAVE_CPU_CLOCK
+#undef ARCH_CPU_CLOCK_WRAPS
 
 #define ARCH_HAVE_INIT
-extern int tsc_reliable;
+extern bool tsc_reliable;
 static inline int arch_init(char *envp[])
 {
-       tsc_reliable = 1;
+       tsc_reliable = true;
        return 0;
 }