From 19ad9eeffb0a679fcb8d2e90b04bb18944dada71 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Mon, 20 Apr 2009 21:14:59 +0000 Subject: [PATCH] [parisc] Fix macro expansion in atomic.h fixing PHONET compilation issue svn path=/dists/sid/linux-2.6/; revision=13460 --- debian/changelog | 3 + .../fix-macro-expansion-in-atomic.h.patch | 58 +++++++++++++++++++ debian/patches/series/4 | 1 + 3 files changed, 62 insertions(+) create mode 100644 debian/patches/bugfix/parisc/fix-macro-expansion-in-atomic.h.patch diff --git a/debian/changelog b/debian/changelog index 4c10c1e3c..17e8f9ae5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 17 Apr 2009 11:30:55 +0200 linux-2.6 (2.6.29-3) unstable; urgency=low diff --git a/debian/patches/bugfix/parisc/fix-macro-expansion-in-atomic.h.patch b/debian/patches/bugfix/parisc/fix-macro-expansion-in-atomic.h.patch new file mode 100644 index 000000000..790a2e83d --- /dev/null +++ b/debian/patches/bugfix/parisc/fix-macro-expansion-in-atomic.h.patch @@ -0,0 +1,58 @@ +commit 47e669ce10901dc92960096653d6b22990b5188f +Author: James Bottomley +Date: Sun Mar 22 03:58:40 2009 +0000 + + parisc: fix macro expansion in atomic.h + + Signed-off-by: James Bottomley + Signed-off-by: Kyle McMartin + +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))) + diff --git a/debian/patches/series/4 b/debian/patches/series/4 index 43428f8aa..d7555a576 100644 --- a/debian/patches/series/4 +++ b/debian/patches/series/4 @@ -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