2008-03-05 06:05:42

by Harvey Harrison

Subject: [PATCH] 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 <[email protected]>
---
This was the only new sparse warning introduced between -rc3 and -rc4 on an
X86_32 allyesconfig.

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 412e025..e600c4e 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)
--
1.5.4.GIT

2008-03-05 07:07:43

by Ingo Molnar

Subject: Re: [PATCH] x86: pageattr.c fix shadowed variable warning

* Harvey Harrison <[email protected]> wrote:

> irqs_disabled() uses flags internally, use _flags to avoid shadowing
> code calling into this macro.

thanks Harvey, applied.

Ingo

2008-03-05 07:12:44

by Harvey Harrison

Subject: Re: [PATCH] x86: pageattr.c fix shadowed variable warning

On Wed, 2008-03-05 at 08:07 +0100, Ingo Molnar wrote:
> * Harvey Harrison <[email protected]> wrote:
>
> > irqs_disabled() uses flags internally, use _flags to avoid shadowing
> > code calling into this macro.
>
> thanks Harvey, applied.

Sorry I gave that patch such a poor name...although the warning shows in
pageattr.c, the patch itself is for include/linux/irqflags.h

Harvey