diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/asm-powerpc/bitops.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/asm-powerpc/bitops.h')
| -rw-r--r-- | include/asm-powerpc/bitops.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/bitops.h b/include/asm-powerpc/bitops.h index 1996eaa8aeae..bf6941a810b8 100644 --- a/include/asm-powerpc/bitops.h +++ b/include/asm-powerpc/bitops.h | |||
| @@ -112,7 +112,7 @@ static __inline__ int test_and_set_bit(unsigned long nr, | |||
| 112 | unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr); | 112 | unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr); |
| 113 | 113 | ||
| 114 | __asm__ __volatile__( | 114 | __asm__ __volatile__( |
| 115 | EIEIO_ON_SMP | 115 | LWSYNC_ON_SMP |
| 116 | "1:" PPC_LLARX "%0,0,%3 # test_and_set_bit\n" | 116 | "1:" PPC_LLARX "%0,0,%3 # test_and_set_bit\n" |
| 117 | "or %1,%0,%2 \n" | 117 | "or %1,%0,%2 \n" |
| 118 | PPC405_ERR77(0,%3) | 118 | PPC405_ERR77(0,%3) |
| @@ -134,7 +134,7 @@ static __inline__ int test_and_clear_bit(unsigned long nr, | |||
| 134 | unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr); | 134 | unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr); |
| 135 | 135 | ||
| 136 | __asm__ __volatile__( | 136 | __asm__ __volatile__( |
| 137 | EIEIO_ON_SMP | 137 | LWSYNC_ON_SMP |
| 138 | "1:" PPC_LLARX "%0,0,%3 # test_and_clear_bit\n" | 138 | "1:" PPC_LLARX "%0,0,%3 # test_and_clear_bit\n" |
| 139 | "andc %1,%0,%2 \n" | 139 | "andc %1,%0,%2 \n" |
| 140 | PPC405_ERR77(0,%3) | 140 | PPC405_ERR77(0,%3) |
| @@ -156,7 +156,7 @@ static __inline__ int test_and_change_bit(unsigned long nr, | |||
| 156 | unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr); | 156 | unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr); |
| 157 | 157 | ||
| 158 | __asm__ __volatile__( | 158 | __asm__ __volatile__( |
| 159 | EIEIO_ON_SMP | 159 | LWSYNC_ON_SMP |
| 160 | "1:" PPC_LLARX "%0,0,%3 # test_and_change_bit\n" | 160 | "1:" PPC_LLARX "%0,0,%3 # test_and_change_bit\n" |
| 161 | "xor %1,%0,%2 \n" | 161 | "xor %1,%0,%2 \n" |
| 162 | PPC405_ERR77(0,%3) | 162 | PPC405_ERR77(0,%3) |