diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 11:26:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 11:26:09 -0800 |
| commit | f0ed5b9a28536b8be2f578a9450cfa42ab31ccf8 (patch) | |
| tree | f252f2f4a2829af46be87b176f4ca236a5d21471 /arch/x86/include/asm/atomic64_32.h | |
| parent | a520458fccc5f5dd4d0ed63c0602db2fd3172b21 (diff) | |
| parent | 8030c36d13f030103356709e63638678fdc66fdc (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, atomic: atomic64_read() take a const pointer
x86, UV: Update Boot messages for SGI UV2 platform
Diffstat (limited to 'arch/x86/include/asm/atomic64_32.h')
| -rw-r--r-- | arch/x86/include/asm/atomic64_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index 24098aafce0..fa13f0ec287 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h @@ -82,7 +82,7 @@ static inline void atomic64_set(atomic64_t *v, long long i) * * Atomically reads the value of @v and returns it. */ -static inline long long atomic64_read(atomic64_t *v) +static inline long long atomic64_read(const atomic64_t *v) { long long r; asm volatile(ATOMIC64_ALTERNATIVE(read) |