[Qemu-devel] [PATCH] maybe fixup! target: [tcg] Redefine DISAS_* onto the generic translation framework (DJ_*)

["Alex Bennée" <alex.bennee@linaro.org>]

Arguably these should be applied to nios2 before these changes.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 target/nios2/cpu.h       | 2 --
 target/nios2/op_helper.c | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 13931f3f0b..b6a97c131e 100644
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -259,8 +259,6 @@ static inline int cpu_interrupts_enabled(CPUNios2State *env)
 }
 
 #include "exec/cpu-all.h"
-#include "exec/exec-all.h"
-
 static inline void cpu_get_tb_cpu_state(CPUNios2State *env, target_ulong *pc,
                                         target_ulong *cs_base, uint32_t *flags)
 {
diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c
index efb1c489c9..04c16e8701 100644
--- a/target/nios2/op_helper.c
+++ b/target/nios2/op_helper.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
+#include "exec/exec-all.h"
 #include "qemu/main-loop.h"
 
 #if !defined(CONFIG_USER_ONLY)
-- 
2.13.0