X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch.h;h=00d247c4ca44216a096f9a5f292b488093ab6378;hb=8f7630813305a4f4f04a5f9ba20b2a7d486c0cfb;hp=0ad7b6ebdf8babc94affbf96e2f2f7a9b7114471;hpb=fa77073a574c3b322529fe11c4af16eed1667079;p=fio.git

diff --git a/arch/arch.h b/arch/arch.h
index 0ad7b6eb..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,
-	arch_i386,
+	arch_x86_64 = 1,
+	arch_x86,
 	arch_ppc,
 	arch_ia64,
 	arch_s390,
@@ -17,10 +11,27 @@ enum {
 	arch_sparc,
 	arch_sparc64,
 	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;
+
+#define ARCH_CPU_CLOCK_WRAPS
+
 #if defined(__i386__)
 #include "arch-x86.h"
 #elif defined(__x86_64__)
@@ -41,15 +52,24 @@ enum {
 #include "arch-arm.h"
 #elif defined(__mips__) || defined(__mips64__)
 #include "arch-mips.h"
+#elif defined(__sh__)
+#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"
+
+#ifndef ARCH_HAVE_INIT
+static inline int arch_init(char *envp[])
+{
+	return 0;
+}
 #endif
 
 #endif