diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-22 23:11:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-22 23:11:54 -0700 |
| commit | 4bee83fb27dd3ceeccf1aec32751fd0d1abb8725 (patch) | |
| tree | 88c96afa73678e6ece06bd34cab3b8f4e45296f7 /include | |
| parent | ab168caf67c5ac1c99a1aca5679d9bd0e07ba43e (diff) | |
| parent | d7633636a23e1bcb57745274c5ae970fa3c7650c (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/atomic.h b/include/asm-sparc/atomic.h index dcc5cd732e1c..aa298155a8d3 100644 --- a/include/asm-sparc/atomic.h +++ b/include/asm-sparc/atomic.h @@ -33,9 +33,9 @@ typedef struct { volatile int counter; } atomic_t; * 31 8 7 0 */ -#define ATOMIC_INIT(i) { (i << 8) } +#define ATOMIC_INIT(i) { ((i) << 8) } -static __inline__ int atomic_read(atomic_t *v) +static __inline__ int atomic_read(const atomic_t *v) { int ret = v->counter; |