Merge branch 'wip-traceinfo' of https://github.com/vears91/fio

[fio.git] / arch / arch.h

diff --git a/arch/arch.h b/arch/arch.h
index 0075f73d022f13ba425ea0c33b3d20885423005c..00d247c4ca44216a096f9a5f292b488093ab6378 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -3,7 +3,7 @@
 
 enum {
        arch_x86_64 = 1,
-       arch_i386,
+       arch_x86,
        arch_ppc,
        arch_ia64,
        arch_s390,
@@ -30,6 +30,8 @@ enum {
 
 extern unsigned long arch_flags;
 
+#define ARCH_CPU_CLOCK_WRAPS
+
 #if defined(__i386__)
 #include "arch-x86.h"
 #elif defined(__x86_64__)
@@ -61,11 +63,7 @@ extern unsigned long arch_flags;
 #include "arch-generic.h"
 #endif
 
-#ifdef ARCH_HAVE_FFZ
-#define ffz(bitmask)   arch_ffz(bitmask)
-#else
 #include "../lib/ffz.h"
-#endif
 
 #ifndef ARCH_HAVE_INIT
 static inline int arch_init(char *envp[])