[Xen-changelog] [xen-3.4-testing] x86: Fix build error after c/s 20969:8cb6e7eff2ba

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267043239 0
# Node ID 60b0e90e2db972d991c405d0e81272bd62d6f4cd
# Parent  faaad66d295db90734690c7c6b2dd208d6f34d96
x86: Fix build error after c/s 20969:8cb6e7eff2ba

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20977:e4851c5b7d00
xen-unstable date:        Wed Feb 24 20:26:08 2010 +0000
---
 xen/arch/x86/traps.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff -r faaad66d295d -r 60b0e90e2db9 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c      Wed Feb 24 18:50:23 2010 +0000
+++ b/xen/arch/x86/traps.c      Wed Feb 24 20:27:19 2010 +0000
@@ -840,8 +840,7 @@ asmlinkage void do_invalid_op(struct cpu
 {
     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;
 
@@ -875,7 +874,7 @@ asmlinkage void do_invalid_op(struct cpu
 
     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;

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