Skip to content

Commit

Permalink
x86: pageattr.c fix shadowed variable warning
Browse files Browse the repository at this point in the history
irqs_disabled() uses flags internally, use _flags to avoid shadowing
code calling into this macro.

Introduced between 2.6.25-rc3 and -rc4

Fixes the sparse warning:
arch/x86/mm/pageattr.c:383:21: warning: symbol 'flags' shadows an earlier one
arch/x86/mm/pageattr.c:369:16: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Harvey Harrison authored and Ingo Molnar committed Apr 19, 2008
1 parent 8ce116e commit a7d5ac8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/linux/irqflags.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@

#define irqs_disabled() \
({ \
unsigned long flags; \
unsigned long _flags; \
\
raw_local_save_flags(flags); \
raw_irqs_disabled_flags(flags); \
raw_local_save_flags(_flags); \
raw_irqs_disabled_flags(_flags); \
})

#define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags)
Expand Down

0 comments on commit a7d5ac8

Please sign in to comment.