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 00163570f82c04f9de2825af424fae28b5d43a2d..b4f26307c6eeee3bd34901091d1d668b59a5e587 100644
(file)
--- a/
arch/arch.h
+++ b/
arch/arch.h
@@
-1,6
+1,12
@@
#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 {
arch_x86_64,
arch_i386,
enum {
arch_x86_64,
arch_i386,
@@
-10,13
+16,17
@@
enum {
arch_alpha,
arch_sparc,
arch_sparc64,
arch_alpha,
arch_sparc,
arch_sparc64,
+ arch_arm,
+ arch_sh,
+
+ arch_generic,
};
#if defined(__i386__)
#include "arch-x86.h"
#elif defined(__x86_64__)
#include "arch-x86_64.h"
};
#if defined(__i386__)
#include "arch-x86.h"
#elif defined(__x86_64__)
#include "arch-x86_64.h"
-#elif defined(__powerpc__) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
|| defined(__ppc__)
#include "arch-ppc.h"
#elif defined(__ia64__)
#include "arch-ia64.h"
#include "arch-ppc.h"
#elif defined(__ia64__)
#include "arch-ia64.h"
@@
-28,8
+38,15
@@
enum {
#include "arch-sparc.h"
#elif defined(__sparc64__)
#include "arch-sparc64.h"
#include "arch-sparc.h"
#elif defined(__sparc64__)
#include "arch-sparc64.h"
+#elif defined(__arm__)
+#include "arch-arm.h"
+#elif defined(__mips__) || defined(__mips64__)
+#include "arch-mips.h"
+#elif defined(__sh__)
+#include "arch-sh.h"
#else
#else
-#error "Unsupported arch"
+#warning "Unknown architecture, attempting to use generic model."
+#include "arch-generic.h"
#endif
#ifdef ARCH_HAVE_FFZ
#endif
#ifdef ARCH_HAVE_FFZ
@@
-38,9
+55,4
@@
enum {
#include "../lib/ffz.h"
#endif
#include "../lib/ffz.h"
#endif
-static inline void spin_lock_init(spinlock_t *lock)
-{
- lock->lock = 0;
-}
-
#endif
#endif