diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-02-24 20:26:08 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-02-24 20:26:08 +0000 |
| commit | ec619d3c3e391b33c9e9f7ba049cb0d323707306 (patch) | |
| tree | 987b9d97736207985a2014f3d477c0a14969aadf | |
| parent | 80b4a3ebc3c6a6a0058452e36fdbc2f7c383d877 (diff) | |
| download | xen-ec619d3c3e391b33c9e9f7ba049cb0d323707306.tar.gz xen-ec619d3c3e391b33c9e9f7ba049cb0d323707306.tar.bz2 xen-ec619d3c3e391b33c9e9f7ba049cb0d323707306.zip | |
x86: Fix build error after c/s 20969:8cb6e7eff2ba
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | xen/arch/x86/traps.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 932ff43a69..1238e9cb96 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -892,8 +892,7 @@ asmlinkage void do_invalid_op(struct cpu_user_regs *regs) { 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_user_regs *regs) 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; |