[Linux-ia64] Idenitfier clash in read_[un]lock

[Linux-ia64] Idenitfier clash in read_[un]lock

[Andreas Schwab]

The read_lock and read_unlock macros should not use such innocent variable
names like tmp because they have a high probability to clash with (part
of) the argument.

Andreas.

--- include/asm-ia64/spinlock.h.~1~	2002-08-03 02:39:45.000000000 +0200
+++ include/asm-ia64/spinlock.h	2003-03-18 10:10:19.000000000 +0100
@@ -112,7 +112,7 @@ typedef struct {
 
 #define read_lock(rw)								\
 do {										\
-	int tmp = 0;								\
+	int __read_lock_tmp = 0;						\
 	__asm__ __volatile__ ("1:\tfetchadd4.acq %0 = [%1], 1\n"		\
 			      ";;\n"						\
 			      "tbit.nz p6,p0 = %0, 31\n"			\
@@ -127,15 +127,15 @@ do {										\
 			      "br.cond.sptk.few 1b\n"				\
 			      ";;\n"						\
 			      ".previous\n"					\
-			      : "=&r" (tmp)					\
+			      : "=&r" (__read_lock_tmp)				\
 			      : "r" (rw) : "p6", "memory");			\
 } while(0)
 
 #define read_unlock(rw)								\
 do {										\
-	int tmp = 0;								\
+	int __read_unlock_tmp = 0;						\
 	__asm__ __volatile__ ("fetchadd4.rel %0 = [%1], -1\n"			\
-			      : "=r" (tmp)					\
+			      : "=r" (__read_unlock_tmp)			\
 			      : "r" (rw)					\
 			      : "memory");					\
 } while(0)

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [Linux-ia64] Idenitfier clash in read_[un]lock

[David Mosberger]

>>>>> On Tue, 18 Mar 2003 15:33:42 +0100, Andreas Schwab <schwab@suse.de> said:

  Andreas> The read_lock and read_unlock macros should not use such
  Andreas> innocent variable names like tmp because they have a high
  Andreas> probability to clash with (part of) the argument.

Thanks, I applied this patch for 2.5.  In the future, it would be nice
if you could send patches that apply with "patch -p1" and if you could
specify what kernel the patch is relative to.

	--david

Re: [Linux-ia64] Idenitfier clash in read_[un]lock

[Andreas Schwab]

David Mosberger <davidm@napali.hpl.hp.com> writes:

|> >>>>> On Tue, 18 Mar 2003 15:33:42 +0100, Andreas Schwab <schwab@suse.de> said:
|> 
|>   Andreas> The read_lock and read_unlock macros should not use such
|>   Andreas> innocent variable names like tmp because they have a high
|>   Andreas> probability to clash with (part of) the argument.
|> 
|> Thanks, I applied this patch for 2.5.  In the future, it would be nice
|> if you could send patches that apply with "patch -p1" and if you could
|> specify what kernel the patch is relative to.

Sorry, I'll take more care the next time.

Thanks, Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."