[XenPPC] [xenppc-unstable] [POWERPC] more -Wshadow issues with gcc4

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

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 326e6736d92bf8079ff360292aeeaef3b2958bb4
# Parent  792d2d89749a6ba3fbac3973cf0c893db5f76c7f
[POWERPC] more -Wshadow issues with gcc4
---
 xen/arch/powerpc/ofd_fixup.c |    4 ++--
 xen/arch/powerpc/oftree.h    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 792d2d89749a -r 326e6736d92b xen/arch/powerpc/ofd_fixup.c
--- a/xen/arch/powerpc/ofd_fixup.c      Mon Aug 21 06:57:14 2006 -0400
+++ b/xen/arch/powerpc/ofd_fixup.c      Mon Aug 21 10:04:37 2006 -0400
@@ -24,6 +24,7 @@
 #include <xen/version.h>
 #include <public/xen.h>
 #include "of-devtree.h"
+#include "oftree.h"
 
 #undef RTAS
 
@@ -440,8 +441,7 @@ static ofdn_t ofd_xen_props(void *m, str
     }
     return n;
 }
-extern int ofd_dom0_fixup(
-    struct domain *d, ulong oftree, start_info_t *si, ulong dst);
+
 int ofd_dom0_fixup(struct domain *d, ulong mem, start_info_t *si, ulong eoload)
 {
     void *m;
diff -r 792d2d89749a -r 326e6736d92b xen/arch/powerpc/oftree.h
--- a/xen/arch/powerpc/oftree.h Mon Aug 21 06:57:14 2006 -0400
+++ b/xen/arch/powerpc/oftree.h Mon Aug 21 10:04:37 2006 -0400
@@ -25,7 +25,7 @@ extern ulong oftree_len;
 extern ulong oftree_len;
 
 extern int ofd_dom0_fixup(
-    struct domain *d, ulong oftree, start_info_t *si, ulong dst);
+    struct domain *d, ulong mem, start_info_t *si, ulong dst);
 
 extern int firmware_image_start[0];
 extern int firmware_image_size[0];

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