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' into gfio
[fio.git]
/
arch
/
arch-ia64.h
diff --git
a/arch/arch-ia64.h
b/arch/arch-ia64.h
index b3ee0c38bc13c442d2166eeabcb0a2c745c763e6..f4464c48b2fa146b6386d8c49cab5179f7484692 100644
(file)
--- a/
arch/arch-ia64.h
+++ b/
arch/arch-ia64.h
@@
-1,7
+1,7
@@
#ifndef ARCH_IA64_H
#define ARCH_IA64_H
#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
#ifndef __NR_ioprio_set
#define __NR_ioprio_set 1274
@@
-18,7
+18,9
@@
#define __NR_sys_vmsplice 1302
#endif
#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 write_barrier() asm volatile ("mf" ::: "memory")
#define ia64_popcnt(x) \
({ \
#define ia64_popcnt(x) \
({ \
@@
-27,9
+29,20
@@
ia64_intri_res; \
})
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));
}
{
return ia64_popcnt(bitmask & (~bitmask - 1));
}
+static inline unsigned long get_cpu_clock(void)
+{
+ unsigned long ret;
+
+ __asm__ __volatile__("mov %0=ar.itc" : "=r" (ret) : : "memory");
+ return ret;
+}
+
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
+
#endif
#endif