diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 21:24:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 21:24:55 -0800 |
| commit | 87530db5ec7d519c7ba334e414307c5130ae2da8 (patch) | |
| tree | a1720bb29998d8d658e91ed106263561a8101bf0 /include/asm-powerpc/system.h | |
| parent | a148058c5cf72ad23fb6c4cf9828f7276e13151c (diff) | |
| parent | d5f079000b20887bfbc84d772a27709c5665e652 (diff) | |
| download | op-kernel-dev-87530db5ec7d519c7ba334e414307c5130ae2da8.zip op-kernel-dev-87530db5ec7d519c7ba334e414307c5130ae2da8.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/system.h')
| -rw-r--r-- | include/asm-powerpc/system.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 9b822af..d9bf536 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h @@ -212,7 +212,7 @@ __xchg_u32(volatile void *p, unsigned long val) unsigned long prev; __asm__ __volatile__( - EIEIO_ON_SMP + LWSYNC_ON_SMP "1: lwarx %0,0,%2 \n" PPC405_ERR77(0,%2) " stwcx. %3,0,%2 \n\ @@ -232,7 +232,7 @@ __xchg_u64(volatile void *p, unsigned long val) unsigned long prev; __asm__ __volatile__( - EIEIO_ON_SMP + LWSYNC_ON_SMP "1: ldarx %0,0,%2 \n" PPC405_ERR77(0,%2) " stdcx. %3,0,%2 \n\ @@ -287,7 +287,7 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new) unsigned int prev; __asm__ __volatile__ ( - EIEIO_ON_SMP + LWSYNC_ON_SMP "1: lwarx %0,0,%2 # __cmpxchg_u32\n\ cmpw 0,%0,%3\n\ bne- 2f\n" @@ -311,7 +311,7 @@ __cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new) unsigned long prev; __asm__ __volatile__ ( - EIEIO_ON_SMP + LWSYNC_ON_SMP "1: ldarx %0,0,%2 # __cmpxchg_u64\n\ cmpd 0,%0,%3\n\ bne- 2f\n\ |
