Commit b7505680 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

fix ia64 local_irq_save() et.al.

psr is not a good name for local variable in macro body when it
has a good chance of being the argument of said macro (actually
is at least in one place)
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea696f9c
...@@ -146,23 +146,23 @@ do { \ ...@@ -146,23 +146,23 @@ do { \
# define local_irq_save(x) \ # define local_irq_save(x) \
do { \ do { \
unsigned long psr; \ unsigned long __psr; \
\ \
__local_irq_save(psr); \ __local_irq_save(__psr); \
if (psr & IA64_PSR_I) \ if (__psr & IA64_PSR_I) \
__save_ip(); \ __save_ip(); \
(x) = psr; \ (x) = __psr; \
} while (0) } while (0)
# define local_irq_disable() do { unsigned long x; local_irq_save(x); } while (0) # define local_irq_disable() do { unsigned long __x; local_irq_save(__x); } while (0)
# define local_irq_restore(x) \ # define local_irq_restore(x) \
do { \ do { \
unsigned long old_psr, psr = (x); \ unsigned long __old_psr, __psr = (x); \
\ \
local_save_flags(old_psr); \ local_save_flags(__old_psr); \
__local_irq_restore(psr); \ __local_irq_restore(__psr); \
if ((old_psr & IA64_PSR_I) && !(psr & IA64_PSR_I)) \ if ((__old_psr & IA64_PSR_I) && !(__psr & IA64_PSR_I)) \
__save_ip(); \ __save_ip(); \
} while (0) } while (0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment