diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 11:11:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 11:11:13 -0400 |
| commit | 43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch) | |
| tree | 67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /include/asm-sparc/system.h | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
| parent | fdc657c66678551c7987dc23a78ae1a26251276f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/system.h')
| -rw-r--r-- | include/asm-sparc/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 3557781a4bfd..1f6b71f9e1b6 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h | |||
| @@ -204,7 +204,7 @@ static inline unsigned long getipl(void) | |||
| 204 | BTFIXUPDEF_CALL(void, ___xchg32, void) | 204 | BTFIXUPDEF_CALL(void, ___xchg32, void) |
| 205 | #endif | 205 | #endif |
| 206 | 206 | ||
| 207 | extern __inline__ unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val) | 207 | static inline unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val) |
| 208 | { | 208 | { |
| 209 | #ifdef CONFIG_SMP | 209 | #ifdef CONFIG_SMP |
| 210 | __asm__ __volatile__("swap [%2], %0" | 210 | __asm__ __volatile__("swap [%2], %0" |