diff --git a/[refs] b/[refs] index 11d26dea6ee2..b2cf37b67ffb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8b435bb918412c9410da4c4b0b02b6b3d99b27c +refs/heads/master: b89d607b590397c04b63d94a9e2fca9649917955 diff --git a/trunk/arch/arm/include/asm/atomic.h b/trunk/arch/arm/include/asm/atomic.h index 68374ba6a943..c79f61faa3a5 100644 --- a/trunk/arch/arm/include/asm/atomic.h +++ b/trunk/arch/arm/include/asm/atomic.h @@ -243,7 +243,7 @@ typedef struct { #define ATOMIC64_INIT(i) { (i) } -static inline u64 atomic64_read(atomic64_t *v) +static inline u64 atomic64_read(const atomic64_t *v) { u64 result;