projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arch: wire up preadv2/pwritev2 for more architectures
[fio.git]
/
arch
/
arch-s390.h
diff --git
a/arch/arch-s390.h
b/arch/arch-s390.h
index bcd91636d04d8e6e3bd2137672377f84813cd57e..71beb7d67fcd6766909c1496985ace34bb9dbb6d 100644
(file)
--- a/
arch/arch-s390.h
+++ b/
arch/arch-s390.h
@@
-18,7
+18,14
@@
#define __NR_sys_vmsplice 309
#endif
#define __NR_sys_vmsplice 309
#endif
-#define nop asm volatile ("diag 0,0,68" : : : "memory")
+#ifndef __NR_preadv2
+#define __NR_preadv2 376
+#endif
+#ifndef __NR_pwritev2
+#define __NR_pwritev2 377
+#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")
#define read_barrier() asm volatile("bcr 15,0" : : : "memory")
#define write_barrier() asm volatile("bcr 15,0" : : : "memory")
@@
-26,10
+33,22
@@
static inline unsigned long long get_cpu_clock(void)
{
unsigned long long clk;
{
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");
__asm__ __volatile__("stck %0" : "=Q" (clk) : : "cc");
- return clk;
+#endif
+ return clk>>12;
}
}
+#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;
static inline int arch_init(char *envp[])
#define ARCH_HAVE_INIT
extern int tsc_reliable;
static inline int arch_init(char *envp[])
@@
-38,6
+57,4
@@
static inline int arch_init(char *envp[])
return 0;
}
return 0;
}
-#define ARCH_HAVE_CPU_CLOCK
-
#endif
#endif