diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-04 22:05:27 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:54 +0200 |
| commit | a7d5ac87b220829bb077cdc8e01c4fd4714ae41e (patch) | |
| tree | 1aac8c19be18c15c615566a949e87c0e14f17af8 /include/linux/irqflags.h | |
| parent | 8ce116e5993cf64729a4d2b3dc2c0f072852654b (diff) | |
| download | linux-stable-a7d5ac87b220829bb077cdc8e01c4fd4714ae41e.tar.gz linux-stable-a7d5ac87b220829bb077cdc8e01c4fd4714ae41e.tar.bz2 linux-stable-a7d5ac87b220829bb077cdc8e01c4fd4714ae41e.zip | |
x86: pageattr.c fix shadowed variable warning
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>
Diffstat (limited to 'include/linux/irqflags.h')
| -rw-r--r-- | include/linux/irqflags.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 412e025bc5c7..e600c4e9b8c5 100644 --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h @@ -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) |