Merge branch 'master' into client-server

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

diff --git a/arch/arch-s390.h b/arch/arch-s390.h
index ed5d462d1d969b7e2db4cb994a88115813b24b44..fe5179134891d66d944797ee8132f2a306e4513c 100644 (file)
--- a/arch/arch-s390.h
+++ b/arch/arch-s390.h
@@ -1,7 +1,7 @@
 #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
@@ -12,7 +12,14 @@
 #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 ("diag 0,0,68" : : : "memory")
-#define fio_ffz(v)     generic_ffz((v))
+#define read_barrier() asm volatile("bcr 15,0" : : : "memory")
+#define write_barrier()        asm volatile("bcr 15,0" : : : "memory")
 
 #endif