[Xen-changelog] [xen-unstable] [XEN][POWERPC] Enable gcc -Wshadow and fix the warnings

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 3f87db7cac89c493a28164dac5c651cbfbb4df24
# Parent  639eb7e6446e0caa97d0432cd07533988aa1cb8b
[XEN][POWERPC] Enable gcc -Wshadow and fix the warnings

As suggested by: Amos Waterland <apw@xxxxxxxxxx>
Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 xen/arch/powerpc/Makefile    |    1 +
 xen/arch/powerpc/mpic.c      |    6 +++---
 xen/arch/powerpc/ofd_fixup.c |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff -r 639eb7e6446e -r 3f87db7cac89 xen/arch/powerpc/Makefile
--- a/xen/arch/powerpc/Makefile Thu Aug 17 20:38:08 2006 -0400
+++ b/xen/arch/powerpc/Makefile Fri Aug 18 05:17:14 2006 -0400
@@ -47,6 +47,7 @@ obj-y += elf32.o
 # These are extra warnings like for the arch/ppc directory but may not
 # allow the rest of the tree to build.
 PPC_C_WARNINGS += -Wundef -Wmissing-prototypes -Wmissing-declarations
+PPC_C_WARNINGS += -Wshadow
 CFLAGS += $(PPC_C_WARNINGS)
 
 LINK=0x400000
diff -r 639eb7e6446e -r 3f87db7cac89 xen/arch/powerpc/mpic.c
--- a/xen/arch/powerpc/mpic.c   Thu Aug 17 20:38:08 2006 -0400
+++ b/xen/arch/powerpc/mpic.c   Fri Aug 18 05:17:14 2006 -0400
@@ -498,10 +498,10 @@ static void mpic_enable_irq(unsigned int
 
 #ifdef CONFIG_MPIC_BROKEN_U3
        if (mpic->flags & MPIC_BROKEN_U3) {
-               unsigned int src = irq - mpic->irq_offset;
-               if (mpic_is_ht_interrupt(mpic, src) &&
+               unsigned int bsrc = irq - mpic->irq_offset;
+               if (mpic_is_ht_interrupt(mpic, bsrc) &&
                    (irq_desc[irq].status & IRQ_LEVEL))
-                       mpic_ht_end_irq(mpic, src);
+                       mpic_ht_end_irq(mpic, bsrc);
        }
 #endif /* CONFIG_MPIC_BROKEN_U3 */
 }
diff -r 639eb7e6446e -r 3f87db7cac89 xen/arch/powerpc/ofd_fixup.c
--- a/xen/arch/powerpc/ofd_fixup.c      Thu Aug 17 20:38:08 2006 -0400
+++ b/xen/arch/powerpc/ofd_fixup.c      Fri Aug 18 05:17:14 2006 -0400
@@ -497,8 +497,8 @@ int ofd_dom0_fixup(struct domain *d, ulo
     r = ofd_prop_add(m, n, "ibm,partition-no", &did, sizeof(did));
     ASSERT( r > 0 );
 
-    const char dom0[] = "dom0";
-    r = ofd_prop_add(m, n, "ibm,partition-name", dom0, sizeof (dom0));
+    const char d0[] = "dom0";
+    r = ofd_prop_add(m, n, "ibm,partition-name", d0, sizeof (d0));
     ASSERT( r > 0 );
 
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog