From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 21 Feb 2013 11:57:56 +0000 (+0100)
Subject: Fixup ia64 32-bit register clock cycle read
X-Git-Tag: fio-2.0.14~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d93904c4ee720b082f1214759dcd7207b8e288d1;p=fio.git

Fixup ia64 32-bit register clock cycle read

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/arch/arch-ia64.h b/arch/arch-ia64.h
index 2df55ba4..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;