1.1 --- a/xen/arch/x86/traps.c	Wed Feb 24 18:48:54 2010 +0000
     1.2 +++ b/xen/arch/x86/traps.c	Wed Feb 24 20:26:08 2010 +0000
     1.3 @@ -892,8 +892,7 @@ asmlinkage void do_invalid_op(struct cpu
     1.4  {
     1.5      struct bug_frame bug;
     1.6      struct bug_frame_str bug_str;
     1.7 -    const void *p;
     1.8 -    const char *filename, *predicate, *eip = (char *)regs->eip;
     1.9 +    const char *p, *filename, *predicate, *eip = (char *)regs->eip;
    1.10      unsigned long fixup;
    1.11      int id, lineno;
    1.12  
    1.13 @@ -928,7 +927,7 @@ asmlinkage void do_invalid_op(struct cpu
    1.14  
    1.15      if ( id == BUGFRAME_run_fn )
    1.16      {
    1.17 -        const void (*fn)(struct cpu_user_regs *) = p;
    1.18 +        void (*fn)(struct cpu_user_regs *) = (void *)p;
    1.19          (*fn)(regs);
    1.20          regs->eip = (unsigned long)eip;
    1.21          return;