powerpc: use ATB clock, if it's available

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

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 2e803cbe5ba13c96e2f377516dca6def34bc013f..8eea5381f41a75443a4cd200286b4690d62ffd79 100644 (file)
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,7 +1,9 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#define ARCH   (arch_i386)
+#include "arch-x86-common.h"
+
+#define FIO_ARCH       (arch_i386)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                289
@@ -18,17 +20,8 @@
 #define __NR_sys_vmsplice      316
 #endif
 
-#ifndef __NR_async_exec
-#define __NR_async_exec                325
-#define __NR_async_wait                326
-#define __NR_umem_add          327
-#define __NR_async_thread      328
-#endif
-
 #define        FIO_HUGE_PAGE           4194304
 
-#define FIO_HAVE_SYSLET
-
 #define nop            __asm__ __volatile__("rep;nop": : :"memory")
 #define read_barrier() __asm__ __volatile__("": : :"memory")
 #define write_barrier()        __asm__ __volatile__("": : :"memory")
@@ -41,7 +34,7 @@ static inline unsigned long arch_ffz(unsigned long bitmask)
 
 static inline unsigned long long get_cpu_clock(void)
 {
-       unsigned long ret;
+       unsigned long long ret;
 
        __asm__ __volatile__("rdtsc" : "=A" (ret));
        return ret;