mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ea696f9cf3
commit
b750568053
1 changed files with 9 additions and 9 deletions
|
|
@ -146,23 +146,23 @@ do { \
|
|||
|
||||
# define local_irq_save(x) \
|
||||
do { \
|
||||
unsigned long psr; \
|
||||
unsigned long __psr; \
|
||||
\
|
||||
__local_irq_save(psr); \
|
||||
if (psr & IA64_PSR_I) \
|
||||
__local_irq_save(__psr); \
|
||||
if (__psr & IA64_PSR_I) \
|
||||
__save_ip(); \
|
||||
(x) = psr; \
|
||||
(x) = __psr; \
|
||||
} 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) \
|
||||
do { \
|
||||
unsigned long old_psr, psr = (x); \
|
||||
unsigned long __old_psr, __psr = (x); \
|
||||
\
|
||||
local_save_flags(old_psr); \
|
||||
__local_irq_restore(psr); \
|
||||
if ((old_psr & IA64_PSR_I) && !(psr & IA64_PSR_I)) \
|
||||
local_save_flags(__old_psr); \
|
||||
__local_irq_restore(__psr); \
|
||||
if ((__old_psr & IA64_PSR_I) && !(__psr & IA64_PSR_I)) \
|
||||
__save_ip(); \
|
||||
} while (0)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue