diff options
| author | Adrian Bunk | 2005-11-07 12:26:59 +0100 |
|---|---|---|
| committer | Adrian Bunk | 2005-11-07 12:26:59 +0100 |
| commit | b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (patch) | |
| tree | 66bf5c66ed505a739bf8633d1931f0d0526bd6d6 /include/asm-ppc64/system.h | |
| parent | Update Michal Wronski contact info (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | kernel-qcow2-linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.tar.gz kernel-qcow2-linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.tar.xz kernel-qcow2-linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.zip | |
Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc64/system.h')
| -rw-r--r-- | include/asm-ppc64/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h index 99b8ca52f101..0cdd66c9f4b7 100644 --- a/include/asm-ppc64/system.h +++ b/include/asm-ppc64/system.h @@ -248,7 +248,7 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new) } static __inline__ unsigned long -__cmpxchg_u64(volatile long *p, unsigned long old, unsigned long new) +__cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new) { unsigned long prev; |