[parisc] Fix macro expansion in atomic.h fixing PHONET compilation issue
svn path=/dists/sid/linux-2.6/; revision=13460
This commit is contained in:
parent
c469bf3189
commit
19ad9eeffb
|
@ -7,6 +7,9 @@ linux-2.6 (2.6.29-4) UNRELEASED; urgency=low
|
|||
[ Martin Michlmayr ]
|
||||
* Extend erase timeout in M25P80 SPI Flash driver (Peter Horton).
|
||||
|
||||
[ dann frazier ]
|
||||
* [parisc] Fix macro expansion in atomic.h fixing PHONET compilation issue
|
||||
|
||||
-- maximilian attems <maks@debian.org> Fri, 17 Apr 2009 11:30:55 +0200
|
||||
|
||||
linux-2.6 (2.6.29-3) unstable; urgency=low
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
commit 47e669ce10901dc92960096653d6b22990b5188f
|
||||
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
|
||||
Date: Sun Mar 22 03:58:40 2009 +0000
|
||||
|
||||
parisc: fix macro expansion in atomic.h
|
||||
|
||||
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
|
||||
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
|
||||
|
||||
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
|
||||
index edbfe25..ada3e53 100644
|
||||
--- a/arch/parisc/include/asm/atomic.h
|
||||
+++ b/arch/parisc/include/asm/atomic.h
|
||||
@@ -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)))
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
+ bugfix/all/drm-intel.git-f544847fbaf099278343f875987a983f2b913134.patch
|
||||
+ bugfix/all/extend-erase-timeout-spi-flash.patch
|
||||
+ bugfix/parisc/fix-macro-expansion-in-atomic.h.patch
|
||||
|
|
Loading…
Reference in New Issue