X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farch-x86.h;h=1ededd845a869b8751c64ed0a06e5bd41aad3273;hb=4e87c37a06b96c4ed1f941eb91ec25e839c68d21;hp=51d7d9674bc220a9a33fff008c52b4c0555359c8;hpb=edf2c6cf5adc82ee43c81e033cf2215eb9ffdb16;p=fio.git diff --git a/arch/arch-x86.h b/arch/arch-x86.h index 51d7d967..1ededd84 100644 --- a/arch/arch-x86.h +++ b/arch/arch-x86.h @@ -1,7 +1,7 @@ #ifndef ARCH_X86_H #define ARCH_X86_H -#define ARCH (arch_i386) +#define FIO_ARCH (arch_i386) #ifndef __NR_ioprio_set #define __NR_ioprio_set 289 @@ -38,35 +38,16 @@ static inline unsigned long arch_ffz(unsigned long 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; + unsigned long ret; - __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"); + __asm__ __volatile__("rdtsc" : "=A" (ret)); + return ret; } -static inline void spin_unlock(spinlock_t *lock) -{ - __asm__ __volatile__("incb %0" - : "+m" (lock->lock) - : - : "memory", "cc"); -} +#define ARCH_HAVE_FFZ +#define ARCH_HAVE_CPU_CLOCK #endif