Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

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

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index a396c850345ddc8cb90042b34d7d39c723aea4c8..2e803cbe5ba13c96e2f377516dca6def34bc013f 100644 (file)
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -30,13 +30,24 @@
 #define FIO_HAVE_SYSLET
 
 #define nop            __asm__ __volatile__("rep;nop": : :"memory")
-#define read_barrier() asm volatile ("": : :"memory")
+#define read_barrier() __asm__ __volatile__("": : :"memory")
+#define write_barrier()        __asm__ __volatile__("": : :"memory")
 
 static inline unsigned long arch_ffz(unsigned long bitmask)
 {
        __asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
        return bitmask;
 }
+
+static inline unsigned long long get_cpu_clock(void)
+{
+       unsigned long ret;
+
+       __asm__ __volatile__("rdtsc" : "=A" (ret));
+       return ret;
+}
+
 #define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
 
 #endif