projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6eb9d1b
)
Fixup ia64 32-bit register clock cycle read
author
Jens Axboe
<axboe@kernel.dk>
Thu, 21 Feb 2013 11:57:56 +0000
(12:57 +0100)
committer
Jens Axboe
<axboe@kernel.dk>
Thu, 21 Feb 2013 11:57:56 +0000
(12:57 +0100)
Signed-off-by: Jens Axboe <axboe@kernel.dk>
arch/arch-ia64.h
patch
|
blob
|
blame
|
history
diff --git
a/arch/arch-ia64.h
b/arch/arch-ia64.h
index 2df55ba4846c838872f1a277da7404abec86b9df..8e8dd7fd4215307879a1d00e46f9b960589e3ba5 100644
(file)
--- 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;