X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch.h;h=00d247c4ca44216a096f9a5f292b488093ab6378;hp=3ee5ac43e563eb0b5e3c72576e18d8729139ce3c;hb=e12f4ede4656ace90e0b9022963dbc03b4ba1fe2;hpb=fb9f08c6b9da943efd334187ac74200e551596f2

diff --git a/arch/arch.h b/arch/arch.h
index 3ee5ac43..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,
@@ -20,6 +14,7 @@ enum {
 	arch_sh,
 	arch_hppa,
 	arch_mips,
+	arch_aarch64,
 
 	arch_generic,
 
@@ -33,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__)
@@ -57,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[])