Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-26' into staging

[qemu.git] / target-i386 / excp_helper.c

diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index ec76eba760d173eb672681f610da9e8260a3b8f6..99fca847dd1c0cea5b12e3cb535d14468fd88042 100644 (file)
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -20,7 +20,7 @@
 #include "cpu.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
-#include "helper.h"
+#include "exec/helper-proto.h"
 
 #if 0
 #define raise_exception_err(env, a, b)                                  \
@@ -108,7 +108,7 @@ static void QEMU_NORETURN raise_interrupt2(CPUX86State *env, int intno,
     env->error_code = error_code;
     env->exception_is_int = is_int;
     env->exception_next_eip = env->eip + next_eip_addend;
-    cpu_loop_exit(env);
+    cpu_loop_exit(cs);
 }
 
 /* shortcuts to generate exceptions */