projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
os/os-mac: kill unused code
[fio.git]
/
arch
/
arch-s390.h
diff --git
a/arch/arch-s390.h
b/arch/arch-s390.h
index 56cb23024bf70f8954cc7bfe29e5b439345f54d7..cc7a1d10de28c0541e21cc5520a126165f30815b 100644
(file)
--- a/
arch/arch-s390.h
+++ b/
arch/arch-s390.h
@@
-22,20
+22,25
@@
#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")
-/*
- * 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;
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");
__asm__ __volatile__("stckf %0" : "=Q" (clk) : : "cc");
+#else
+ __asm__ __volatile__("stck %0" : "=Q" (clk) : : "cc");
+#endif
return clk>>12;
}
#define ARCH_CPU_CLOCK_CYCLES_PER_USEC 1
#define ARCH_HAVE_CPU_CLOCK
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;
#define ARCH_HAVE_INIT
extern int tsc_reliable;