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-x86.h
diff --git
a/arch/arch-x86.h
b/arch/arch-x86.h
index b9249eae6f449d4f04e6fc2e6f25873eb9763527..2e803cbe5ba13c96e2f377516dca6def34bc013f 100644
(file)
--- a/
arch/arch-x86.h
+++ b/
arch/arch-x86.h
@@
-38,37
+38,16
@@
static inline unsigned long arch_ffz(unsigned long bitmask)
__asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
return bitmask;
}
__asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
return bitmask;
}
-#define ARCH_HAVE_FFZ
-
-typedef struct {
- unsigned int lock;
-} spinlock_t;
-static inline
void spin_lock(spinlock_t *lock
)
+static inline
unsigned long long get_cpu_clock(void
)
{
{
- short inc = 0x0100;
-
- __asm__ __volatile__("xaddw %w0, %1\n"
- "1:\t"
- "cmpb %h0, %b0\n\t"
- "je 2f\n\t"
- "rep ; nop\n\t"
- "movb %1, %b0\n\t"
- "jmp 1b\n"
- "2:"
- : "+Q" (inc), "+m" (lock->lock)
- :
- : "memory", "cc");
-}
+ unsigned long ret;
-static inline void spin_unlock(spinlock_t *lock)
-{
- __asm__ __volatile__("incb %0"
- : "+m" (lock->lock)
- :
- : "memory", "cc");
+ __asm__ __volatile__("rdtsc" : "=A" (ret));
+ return ret;
}
}
-#define __SPIN_LOCK_UNLOCKED { 0 }
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
#endif
#endif