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

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

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

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/traps.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff -r f8692cc67d67 -r e4851c5b7d00 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 20:26:08 2010 +0000
@@ -892,8 +892,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;
 
@@ -928,7 +927,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