Re: [XenPPC] [PATCH] Fix compilation errors

2006-08-21 Thread Maria Butrico 
I am not sure what this means.  The code from the hg repository still 
does not compile.



Jimi Xenidis wrote:


On Aug 20, 2006, at 9:58 PM, Maria Butrico wrote:


Summary:  Allow compilation under gcc4

diff -r dbe9249ba61b xen/arch/powerpc/oftree.h


I covered the current.h issues with dan, how about this for oftree.h, 
it clean up some too:


diff -r 792d2d89749a xen/arch/powerpc/ofd_fixup.c
--- a/xen/arch/powerpc/ofd_fixup.cMon Aug 21 06:57:14 2006 -0400
+++ b/xen/arch/powerpc/ofd_fixup.cMon Aug 21 07:23:48 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 xen/arch/powerpc/oftree.h
--- a/xen/arch/powerpc/oftree.hMon Aug 21 06:57:14 2006 -0400
+++ b/xen/arch/powerpc/oftree.hMon Aug 21 07:23:48 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@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel

[XenPPC] [PATCH] Fix compilation errors

2006-08-20 Thread Maria Butrico 
Summary:  Allow compilation under gcc4

Current Xen does not compile.  Declaration shadows parameters.

Signed-off-by:  Maria Butrico [EMAIL PROTECTED]


diff -r dbe9249ba61b xen/arch/powerpc/oftree.h
--- a/xen/arch/powerpc/oftree.h Sun Aug 20 13:28:45 2006 -0400
+++ b/xen/arch/powerpc/oftree.h Sun Aug 20 21:19:04 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 oftree1, start_info_t *si, ulong dst);
 
 extern int firmware_image_start[0];
 extern int firmware_image_size[0];
diff -r dbe9249ba61b xen/include/asm-powerpc/current.h
--- a/xen/include/asm-powerpc/current.h Sun Aug 20 13:28:45 2006 -0400
+++ b/xen/include/asm-powerpc/current.h Sun Aug 20 21:16:02 2006 -0400
@@ -66,7 +66,7 @@ static inline struct cpu_user_regs *gues
 
 static inline void reset_stack_and_jump(void (*f)(void))
 {
-void _reset_stack_and_jump(void (*f)(void), struct cpu_user_regs *regs);
+void _reset_stack_and_jump(void (*f1)(void), struct cpu_user_regs *regs);
 struct cpu_user_regs *regs = guest_cpu_user_regs();
 
 #ifdef TRACK_RESUME



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