X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-ia64.h;h=53c049fdf1866f11f4ddd517a8b9deaa2326dcc4;hp=8ccbd865e01513eeaf7ace812a58d5ca8ea7245c;hb=e12f4ede4656ace90e0b9022963dbc03b4ba1fe2;hpb=d06ab917303f70289ad8f256c6e79a1eeee4bee4

diff --git a/arch/arch-ia64.h b/arch/arch-ia64.h
index 8ccbd865..53c049fd 100644
--- 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;
@@ -47,6 +32,7 @@ extern int tsc_reliable;
 static inline int arch_init(char *envp[])
 {
 	tsc_reliable = 1;
+	return 0;
 }
 
 #define ARCH_HAVE_FFZ