dedupe: fix warning and segfault on -B0

[fio.git] / arch / arch.h

diff --git a/arch/arch.h b/arch/arch.h
index 16f4c3ab2f7b40a06e638c1fed1da7b96d921aa5..0075f73d022f13ba425ea0c33b3d20885423005c 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -1,14 +1,8 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#ifdef __WORDSIZE
-#define BITS_PER_LONG  __WORDSIZE
-#else
-#define BITS_PER_LONG  32
-#endif
-
 enum {
-       arch_x86_64,
+       arch_x86_64 = 1,
        arch_i386,
        arch_ppc,
        arch_ia64,
@@ -19,10 +13,23 @@ enum {
        arch_arm,
        arch_sh,
        arch_hppa,
+       arch_mips,
+       arch_aarch64,
 
        arch_generic,
+
+       arch_nr,
 };
 
+enum {
+       ARCH_FLAG_1     = 1 << 0,
+       ARCH_FLAG_2     = 1 << 1,
+       ARCH_FLAG_3     = 1 << 2,
+       ARCH_FLAG_4     = 1 << 3,
+};
+
+extern unsigned long arch_flags;
+
 #if defined(__i386__)
 #include "arch-x86.h"
 #elif defined(__x86_64__)
@@ -47,6 +54,8 @@ 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"
@@ -65,11 +74,4 @@ static inline int arch_init(char *envp[])
 }
 #endif
 
-enum {
-       ARCH_FLAG_1     = 1 << 0,
-       ARCH_FLAG_2     = 1 << 1,
-       ARCH_FLAG_3     = 1 << 2,
-       ARCH_FLAG_4     = 1 << 3,
-};
-
 #endif