diff --git a/plat/linux68k/emu/musashi/m68kcpu.c b/plat/linux68k/emu/musashi/m68kcpu.c
index 040980abd..d50e3fa68 100755
--- a/plat/linux68k/emu/musashi/m68kcpu.c
+++ b/plat/linux68k/emu/musashi/m68kcpu.c
@@ -600,7 +600,12 @@ static void default_instr_hook_callback(unsigned int pc)
 
 #if M68K_EMULATE_ADDRESS_ERROR
 	#include <setjmp.h>
+
+#ifdef _BSD_SETJMP_H
+ sigjmp_buf m68ki_aerr_trap;
+#else
 	jmp_buf m68ki_aerr_trap;
+#endif 
 #endif /* M68K_EMULATE_ADDRESS_ERROR */
 
 /* ======================================================================== */
diff --git a/plat/linux68k/emu/musashi/m68kcpu.h b/plat/linux68k/emu/musashi/m68kcpu.h
index 63afc7c48..7cd04c585 100755
--- a/plat/linux68k/emu/musashi/m68kcpu.h
+++ b/plat/linux68k/emu/musashi/m68kcpu.h
@@ -609,7 +609,7 @@ extern sigjmp_buf m68ki_aerr_trap;
 	if(sigsetjmp(m68ki_aerr_trap, 0) != 0) \
 	{ \
 		m68ki_exception_address_error(m68k); \
-		if(m68ki_stopped) \
+		if(CPU_STOPPED) \
 		{ \
 			if (m68ki_remaining_cycles > 0) \
 				m68ki_remaining_cycles = 0; \