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

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