X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-ia64.h;h=8e8dd7fd4215307879a1d00e46f9b960589e3ba5;hb=4db089f5dd8a00eb4efdc8694735ef2cc3843998;hp=d9afc32e702389ab0cc94fae80f696bf3a30d501;hpb=69ebbd397e80b23ec4281c99e9f7242a089cc771;p=fio.git

diff --git a/arch/arch-ia64.h b/arch/arch-ia64.h
index d9afc32e..8e8dd7fd 100644
--- a/arch/arch-ia64.h
+++ b/arch/arch-ia64.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_IA64_H
 #define ARCH_IA64_H
 
-#define ARCH	(arch_ia64)
+#define FIO_ARCH	(arch_ia64)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set		1274
@@ -20,7 +20,7 @@
 
 #define nop		asm volatile ("hint @pause" ::: "memory");
 #define read_barrier()	asm volatile ("mf" ::: "memory")
-#define writebarrier()	asm volatile ("mf" ::: "memory")
+#define write_barrier()	asm volatile ("mf" ::: "memory")
 
 #define ia64_popcnt(x)							\
 ({									\
@@ -33,40 +33,24 @@ static inline unsigned long arch_ffz(unsigned long bitmask)
 {
 	return ia64_popcnt(bitmask & (~bitmask - 1));
 }
-#define ARCH_HAVE_FFZ
-
-typedef struct {
-	volatile unsigned int lock;
-} spinlock_t;
 
-#define IA64_SPINLOCK_CLOBBERS "ar.ccv", "ar.pfs", "p14", "p15", "r27", "r28", "r29", "r30", "b6", "memory"
-
-static inline void spin_lock(spinlock_t *lock)
+static inline unsigned long long get_cpu_clock(void)
 {
-	register volatile unsigned int *ptr asm ("r31") = &lock->lock;
-	unsigned long flags = 0;
+	unsigned long long ret;
 
-	__asm__ __volatile__("{\n\t"
-			"  mov ar.ccv = r0\n\t"
-			"  mov r28 = ip\n\t"
-			"  mov r30 = 1;;\n\t"
-			"}\n\t"
-			"cmpxchg4.acq r30 = [%1], r30, ar.ccv\n\t"
-			"movl r29 = ia64_spinlock_contention_pre3_4;;\n\t"
-			"cmp4.ne p14, p0 = r30, r0\n\t"
-			"mov b6 = r29;;\n\t"
-			"mov r27=%2\n\t"
-			"(p14) br.cond.spnt.many b6"
-			: "=r"(ptr) : "r"(ptr), "r" (flags)
-			: IA64_SPINLOCK_CLOBBERS);
+	__asm__ __volatile__("mov %0=ar.itc" : "=r" (ret) : : "memory");
+	return ret;
 }
 
-static inline void spin_unlock(spinlock_t *lock)
+#define ARCH_HAVE_INIT
+extern int tsc_reliable;
+static inline int arch_init(char *envp[])
 {
-	read_barrier();
-	__asm__ __volatile__("st4.rel.nta [%0] = r0\n\t" :: "r" (lock));
+	tsc_reliable = 1;
+	return 0;
 }
 
-#define __SPIN_LOCK_UNLOCKED	{ 0 }
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
 
 #endif