summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@kernel.bkbits.net>2003-09-22 21:17:38 -0700
committerDavid S. Miller <davem@kernel.bkbits.net>2003-09-22 21:17:38 -0700
commitd7633636a23e1bcb57745274c5ae970fa3c7650c (patch)
tree4104d67504b2f36686c0387626af923d5b469580 /include
parent0873a5d658e715b0e6450339b5d0e3a8cdcb97b7 (diff)
parent536ce50d59be1b80999fb7e6838a2f0d86b5ade4 (diff)
Merge davem@nuts.ninka.net:/disk1/davem/BK/sparc-2.5
into kernel.bkbits.net:/home/davem/sparc-2.5
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/atomic.h4
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;