Re: Re: [Xen-changelog] [xen-3.4-testing] x86: Generalise BUGFRAME_dump mechanism to allow polled UART irq to

[Keir Fraser <keir.fraser@eu.citrix.com>]

[-- Attachment #1: Type: text/plain, Size: 1917 bytes --]

On 24/02/2010 19:13, "Conny Seidel" <conny.seidel@amd.com> wrote:

> On Wed, 24 Feb 2010 08:25:07 -0500
> Mark Johnson <johnson.nh@gmail.com> wrote:
> 
>> FYI, I see the following build error with this patch...
>> 
>> MRJ
> 
> We also see build issues with this patch.
> 
> Error message:
> cc1: warnings being treated as errors
> traps.c: In function Œdo_invalid_op¹:
> traps.c:931: warning: type qualifiers ignored on function return type

Does the attached patch fix this?

 -- Keir

> gmake[4]: *** [traps.o] Error 1
> gmake[4]: Leaving directory `/xen/xen-unstable.hg/xen/arch/x86'
> gmake[3]: *** [/xen/xen-unstable.hg/xen/arch/x86/built_in.o] Error 2
> gmake[3]: Leaving directory `/xen/xen-unstable.hg/xen/arch/x86'
> gmake[2]: *** [/xen/xen-unstable.hg/xen/xen] Error 2
> gmake[2]: Leaving directory `/xen/xen-unstable.hg/xen'
> gmake[1]: *** [install] Error 2
> gmake[1]: Leaving directory `/xen/xen-unstable.hg/xen'
> gmake: *** [install-xen] Error 2
> 
> 
> ##
> ##################################################################
> # Position   : Systems Design Technician @ OSRC                  #
> # Email      : conny.seidel@amd.com  GnuPG-Key: 0xA6AB055D       #
> # Fingerprint: 17C4 5DB2 7C4C C1C7 1452 8148 F139 7C09 A6AB 055D #
> #----------------------------------------------------------------#
> # Advanced Micro Devices GmbH                                    #
> # Karl-Hammerschmidt-Str. 34                                     #
> # 85609 Dornach b. München                                       #
> #                                                                #
> # Geschäftsführer: Andrew Bowd; Thomas M. McCoy; Giuliano Meroni #
> # Sitz: Dornach, Gemeinde Aschheim, Landkreis München            #
> # Registergericht München, HRB Nr. 43632                         #
> ##################################################################


[-- Attachment #2: 00-fix --]
[-- Type: application/octet-stream, Size: 701 bytes --]

diff -r f8692cc67d67 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c	Wed Feb 24 18:48:54 2010 +0000
+++ b/xen/arch/x86/traps.c	Wed Feb 24 19:43:01 2010 +0000
@@ -892,8 +892,7 @@
 {
     struct bug_frame bug;
     struct bug_frame_str bug_str;
-    const void *p;
-    const char *filename, *predicate, *eip = (char *)regs->eip;
+    const char *p, *filename, *predicate, *eip = (char *)regs->eip;
     unsigned long fixup;
     int id, lineno;
 
@@ -928,7 +927,7 @@
 
     if ( id == BUGFRAME_run_fn )
     {
-        const void (*fn)(struct cpu_user_regs *) = p;
+        void (*fn)(struct cpu_user_regs *) = (void *)p;
         (*fn)(regs);
         regs->eip = (unsigned long)eip;
         return;

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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