Merge remote-tracking branch 'filippov/tags/20130729-xtensa' into staging

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

diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index 64c8346d3b12442f128a3b419e4765fffc6ecfe3..5319aef7dfd9921c7e6f4553ce1f796a2a6f6505 100644 (file)
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "qemu/log.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "helper.h"
 
 #if 0
@@ -87,7 +87,7 @@ static int check_exception(CPUX86State *env, int intno, int *error_code)
 /*
  * Signal an interruption. It is executed in the main CPU loop.
  * is_int is TRUE if coming from the int instruction. next_eip is the
- * EIP value AFTER the interrupt instruction. It is only relevant if
+ * env->eip value AFTER the interrupt instruction. It is only relevant if
  * is_int is TRUE.
  */
 static void QEMU_NORETURN raise_interrupt2(CPUX86State *env, int intno,