ia64: Patch by 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.

diff --git a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h
index ae846ea912248f4ee4a8af28d9206fa86479309f..2a40f54961299f9338a6b978d2c160a983953a88 100644 (file)
--- a/include/asm-ia64/spinlock.h
+++ b/include/asm-ia64/spinlock.h
@@ -82,7 +82,7 @@ typedef struct {
 
 #define _raw_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"                        \
@@ -97,15 +97,15 @@ do {                                                                                \
                              "br.cond.sptk.few 1b\n"                           \
                              ";;\n"                                            \
                              ".previous\n"                                     \
-                             : "=&r" (tmp)                                     \
+                             : "=&r" (__read_lock_tmp)                         \
                              : "r" (rw) : "p6", "memory");                     \
 } while(0)
 
 #define _raw_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)