X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch.h;h=4fb9b518085aeeae06a390874ee35346ad5ef9b7;hp=d598652bb2e8ced3a44769d6d72fa440e3ade079;hb=24575392bff8bdb9ec7709a78b4fbd48367fc1f5;hpb=5f739e0e2912b809635fac635a8c1140155577e6

diff --git a/arch/arch.h b/arch/arch.h
index d598652b..4fb9b518 100644
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -1,15 +1,11 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#ifdef __WORDSIZE
-#define BITS_PER_LONG	__WORDSIZE
-#else
-#define BITS_PER_LONG	32
-#endif
+#include "../lib/types.h"
 
 enum {
-	arch_x86_64,
-	arch_i386,
+	arch_x86_64 = 1,
+	arch_x86,
 	arch_ppc,
 	arch_ia64,
 	arch_s390,
@@ -19,8 +15,12 @@ enum {
 	arch_arm,
 	arch_sh,
 	arch_hppa,
+	arch_mips,
+	arch_aarch64,
 
 	arch_generic,
+
+	arch_nr,
 };
 
 enum {
@@ -30,6 +30,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__)
@@ -54,16 +58,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[])