X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch.h;h=00d247c4ca44216a096f9a5f292b488093ab6378;hb=63a26e05622b0ced2cc685f545f493e794ccc325;hp=4ad49a42b74f0c5b08e4f245f49571ea0b96fc5e;hpb=fddc6604f91ebf76d9090741f9d4f5a4d33be0c6;p=fio.git

diff --git a/arch/arch.h b/arch/arch.h
index 4ad49a42..00d247c4 100644
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -1,15 +1,9 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#ifdef __WORDSIZE
-#define BITS_PER_LONG	__WORDSIZE
-#else
-#define BITS_PER_LONG	32
-#endif
-
 enum {
 	arch_x86_64 = 1,
-	arch_i386,
+	arch_x86,
 	arch_ppc,
 	arch_ia64,
 	arch_s390,
@@ -19,6 +13,8 @@ enum {
 	arch_arm,
 	arch_sh,
 	arch_hppa,
+	arch_mips,
+	arch_aarch64,
 
 	arch_generic,
 
@@ -32,6 +28,10 @@ enum {
 	ARCH_FLAG_4	= 1 << 3,
 };
 
+extern unsigned long arch_flags;
+
+#define ARCH_CPU_CLOCK_WRAPS
+
 #if defined(__i386__)
 #include "arch-x86.h"
 #elif defined(__x86_64__)
@@ -56,16 +56,14 @@ enum {
 #include "arch-sh.h"
 #elif defined(__hppa__)
 #include "arch-hppa.h"
+#elif defined(__aarch64__)
+#include "arch-aarch64.h"
 #else
 #warning "Unknown architecture, attempting to use generic model."
 #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[])