aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoern Engel <joern@logfs.org>2013-05-20 09:52:56 -0700
committerJoern Engel <joern@logfs.org>2013-05-20 09:52:56 -0700
commitf39787f1e3a395770a3e8e813806dbdaecf970ec (patch)
tree1ea890771a55be0714fdd77fa89be7ab0df0d5b0
parent70c51bff6b6a26147b1528674ada81b965f1c526 (diff)
downloadbcon2-f39787f1e3a395770a3e8e813806dbdaecf970ec.tar.gz
x86: atomic64_read should return long long
Causes warnings when used as a printk parameter. All other variants of the function return long long. Signed-off-by: Joern Engel <joern@logfs.org>
-rw-r--r--arch/x86/include/asm/atomic64_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
index 0e1cbfc8ee063..b0ac85bc81796 100644
--- a/arch/x86/include/asm/atomic64_64.h
+++ b/arch/x86/include/asm/atomic64_64.h
@@ -16,7 +16,7 @@
* Atomically reads the value of @v.
* Doesn't imply a read memory barrier.
*/
-static inline long atomic64_read(const atomic64_t *v)
+static inline long long atomic64_read(const atomic64_t *v)
{
return (*(volatile long *)&(v)->counter);
}