projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
[fio.git]
/
arch
/
arch.h
diff --git
a/arch/arch.h
b/arch/arch.h
index 8cafa118af2c036e7afc88a93bb7602ca221626b..31d96d403167dd3435b6f9e66e68a055f605e7b6 100644
(file)
--- a/
arch/arch.h
+++ b/
arch/arch.h
@@
-1,14
+1,8
@@
#ifndef ARCH_H
#define ARCH_H
#ifndef ARCH_H
#define ARCH_H
-#ifdef __WORDSIZE
-#define BITS_PER_LONG __WORDSIZE
-#else
-#define BITS_PER_LONG 32
-#endif
-
enum {
enum {
- arch_x86_64,
+ arch_x86_64
= 1
,
arch_i386,
arch_ppc,
arch_ia64,
arch_i386,
arch_ppc,
arch_ia64,
@@
-19,10
+13,22
@@
enum {
arch_arm,
arch_sh,
arch_hppa,
arch_arm,
arch_sh,
arch_hppa,
+ arch_mips,
arch_generic,
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__)
#if defined(__i386__)
#include "arch-x86.h"
#elif defined(__x86_64__)
@@
-58,4
+64,11
@@
enum {
#include "../lib/ffz.h"
#endif
#include "../lib/ffz.h"
#endif
+#ifndef ARCH_HAVE_INIT
+static inline int arch_init(char *envp[])
+{
+ return 0;
+}
+#endif
+
#endif
#endif