Revert "Add spinlocks"

[fio.git] / arch / arch-ia64.h

diff --git a/arch/arch-ia64.h b/arch/arch-ia64.h
index b3ee0c38bc13c442d2166eeabcb0a2c745c763e6..2f926849fb04cc9e13d5e514c6ac6f255a32360e 100644 (file)
--- a/arch/arch-ia64.h
+++ b/arch/arch-ia64.h
@@ -18,7 +18,9 @@
 #define __NR_sys_vmsplice      1302
 #endif
 
-#define nop    asm volatile ("hint @pause" ::: "memory");
+#define nop            asm volatile ("hint @pause" ::: "memory");
+#define read_barrier() asm volatile ("mf" ::: "memory")
+#define writebarrier() asm volatile ("mf" ::: "memory")
 
 #define ia64_popcnt(x)                                                 \
 ({                                                                     \
@@ -27,9 +29,10 @@
        ia64_intri_res;                                                 \
 })
 
-static inline unsigned long ffz(unsigned long bitmask)
+static inline unsigned long arch_ffz(unsigned long bitmask)
 {
        return ia64_popcnt(bitmask & (~bitmask - 1));
 }
+#define ARCH_HAVE_FFZ
 
 #endif