Merge branch 'wip-traceinfo' of https://github.com/vears91/fio

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

diff --git a/arch/arch-ia64.h b/arch/arch-ia64.h
index 2df55ba4846c838872f1a277da7404abec86b9df..53c049fdf1866f11f4ddd517a8b9deaa2326dcc4 100644 (file)
--- a/arch/arch-ia64.h
+++ b/arch/arch-ia64.h
@@ -3,21 +3,6 @@
 
 #define FIO_ARCH       (arch_ia64)
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set                1274
-#define __NR_ioprio_get                1275
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64         1234
-#endif
-
-#ifndef __NR_sys_splice
-#define __NR_sys_splice                1297
-#define __NR_sys_tee           1301
-#define __NR_sys_vmsplice      1302
-#endif
-
 #define nop            asm volatile ("hint @pause" ::: "memory");
 #define read_barrier() asm volatile ("mf" ::: "memory")
 #define write_barrier()        asm volatile ("mf" ::: "memory")
@@ -34,9 +19,9 @@ static inline unsigned long arch_ffz(unsigned long bitmask)
        return ia64_popcnt(bitmask & (~bitmask - 1));
 }
 
-static inline unsigned long get_cpu_clock(void)
+static inline unsigned long long get_cpu_clock(void)
 {
-       unsigned long ret;
+       unsigned long long ret;
 
        __asm__ __volatile__("mov %0=ar.itc" : "=r" (ret) : : "memory");
        return ret;