Commit 47e669ce authored by James Bottomley's avatar James Bottomley Committed by Kyle McMartin
Browse files

parisc: fix macro expansion in atomic.h 



Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 2d6d79bb

arch/parisc/include/asm/atomic.h

+9 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * Since "a" is usually an address, use one spinlock per cacheline.

 */

#  define ATOMIC_HASH_SIZE 4

#  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) a)/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))

#  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) (a))/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))



extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
@@ -222,13 +222,13 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) 


#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic_add(i,v)	((void)(__atomic_add_return( ((int)i),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int)i),(v))))

#define atomic_add(i,v)	((void)(__atomic_add_return( ((int)(i)),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int)(i)),(v))))

#define atomic_inc(v)	((void)(__atomic_add_return(   1,(v))))

#define atomic_dec(v)	((void)(__atomic_add_return(  -1,(v))))



#define atomic_add_return(i,v)	(__atomic_add_return( ((int)i),(v)))

#define atomic_sub_return(i,v)	(__atomic_add_return(-((int)i),(v)))

#define atomic_add_return(i,v)	(__atomic_add_return( ((int)(i)),(v)))

#define atomic_sub_return(i,v)	(__atomic_add_return(-((int)(i)),(v)))

#define atomic_inc_return(v)	(__atomic_add_return(   1,(v)))

#define atomic_dec_return(v)	(__atomic_add_return(  -1,(v)))
@@ -289,13 +289,13 @@ atomic64_read(const atomic64_t *v) 
	return v->counter;

}



#define atomic64_add(i,v)	((void)(__atomic64_add_return( ((s64)i),(v))))

#define atomic64_sub(i,v)	((void)(__atomic64_add_return(-((s64)i),(v))))

#define atomic64_add(i,v)	((void)(__atomic64_add_return( ((s64)(i)),(v))))

#define atomic64_sub(i,v)	((void)(__atomic64_add_return(-((s64)(i)),(v))))

#define atomic64_inc(v)		((void)(__atomic64_add_return(   1,(v))))

#define atomic64_dec(v)		((void)(__atomic64_add_return(  -1,(v))))



#define atomic64_add_return(i,v)	(__atomic64_add_return( ((s64)i),(v)))

#define atomic64_sub_return(i,v)	(__atomic64_add_return(-((s64)i),(v)))

#define atomic64_add_return(i,v)	(__atomic64_add_return( ((s64)(i)),(v)))

#define atomic64_sub_return(i,v)	(__atomic64_add_return(-((s64)(i)),(v)))

#define atomic64_inc_return(v)		(__atomic64_add_return(   1,(v)))

#define atomic64_dec_return(v)		(__atomic64_add_return(  -1,(v)))